Make gtkmarshal.list/gtkmarshal.h only for compatibility with GTK+-1.2;
authorOwen Taylor <otaylor@redhat.com>
Sat, 17 Nov 2001 23:28:51 +0000 (23:28 +0000)
committerOwen Taylor <otaylor@src.gnome.org>
Sat, 17 Nov 2001 23:28:51 +0000 (23:28 +0000)
Sat Nov 17 18:26:45 2001  Owen Taylor  <otaylor@redhat.com>

* gtk/Makefile.am gtk/gtkmarshal.list gtk/gtkmarshalers.list
gtk/*.c gtk/gtksignal.h: Make gtkmarshal.list/gtkmarshal.h
only for compatibility with GTK+-1.2; and deprecate it;
put all marshalers we actually use into gtkmarshalers.list
and use the _gtk_marshal_ prefix for these marshalers.

67 files changed:
ChangeLog
ChangeLog.pre-2-0
ChangeLog.pre-2-10
ChangeLog.pre-2-2
ChangeLog.pre-2-4
ChangeLog.pre-2-6
ChangeLog.pre-2-8
gtk/Makefile.am
gtk/gtkaccelgroup.c
gtk/gtkadjustment.c
gtk/gtkbutton.c
gtk/gtkcelleditable.c
gtk/gtkcellrenderertext.c
gtk/gtkcellrenderertoggle.c
gtk/gtkcheckmenuitem.c
gtk/gtkclist.c
gtk/gtkcolorsel.c
gtk/gtkcontainer.c
gtk/gtkctree.c
gtk/gtkcurve.c
gtk/gtkdialog.c
gtk/gtkeditable.c
gtk/gtkentry.c
gtk/gtkhandlebox.c
gtk/gtkhsv.c
gtk/gtkimcontext.c
gtk/gtkinputdialog.c
gtk/gtkitem.c
gtk/gtklabel.c
gtk/gtklayout.c
gtk/gtklist.c
gtk/gtklistitem.c
gtk/gtkmarshal.list
gtk/gtkmarshalers.list
gtk/gtkmenuitem.c
gtk/gtkmenushell.c
gtk/gtknotebook.c
gtk/gtkobject.c
gtk/gtkoldeditable.c
gtk/gtkoptionmenu.c
gtk/gtkplug.c
gtk/gtkrange.c
gtk/gtkscale.c
gtk/gtksignal.c
gtk/gtksignal.h
gtk/gtksocket.c
gtk/gtkspinbutton.c
gtk/gtkstatusbar.c
gtk/gtktext.c
gtk/gtktextbuffer.c
gtk/gtktextlayout.c
gtk/gtktexttag.c
gtk/gtktexttagtable.c
gtk/gtktextview.c
gtk/gtktipsquery.c
gtk/gtktogglebutton.c
gtk/gtktoolbar.c
gtk/gtktree.c
gtk/gtktreeitem.c
gtk/gtktreemodel.c
gtk/gtktreeselection.c
gtk/gtktreesortable.c
gtk/gtktreeview.c
gtk/gtktreeviewcolumn.c
gtk/gtkviewport.c
gtk/gtkwidget.c
gtk/gtkwindow.c

index e72cf1db7fadcaf2e5676e84c5906a096cc6460a..e89d3ff5e9fcee32c439544c263397f8f8ae4024 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Sat Nov 17 18:26:45 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/Makefile.am gtk/gtkmarshal.list gtk/gtkmarshalers.list
+       gtk/*.c gtk/gtksignal.h: Make gtkmarshal.list/gtkmarshal.h
+       only for compatibility with GTK+-1.2; and deprecate it; 
+       put all marshalers we actually use into gtkmarshalers.list 
+       and use the _gtk_marshal_ prefix for these marshalers.
+
 2001-11-17  Murray Cumming  <murrayc@usa.net>
 
        * gtk/gtktexttagtable.c (gtk_text_tag_table_class_init):
index e72cf1db7fadcaf2e5676e84c5906a096cc6460a..e89d3ff5e9fcee32c439544c263397f8f8ae4024 100644 (file)
@@ -1,3 +1,11 @@
+Sat Nov 17 18:26:45 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/Makefile.am gtk/gtkmarshal.list gtk/gtkmarshalers.list
+       gtk/*.c gtk/gtksignal.h: Make gtkmarshal.list/gtkmarshal.h
+       only for compatibility with GTK+-1.2; and deprecate it; 
+       put all marshalers we actually use into gtkmarshalers.list 
+       and use the _gtk_marshal_ prefix for these marshalers.
+
 2001-11-17  Murray Cumming  <murrayc@usa.net>
 
        * gtk/gtktexttagtable.c (gtk_text_tag_table_class_init):
index e72cf1db7fadcaf2e5676e84c5906a096cc6460a..e89d3ff5e9fcee32c439544c263397f8f8ae4024 100644 (file)
@@ -1,3 +1,11 @@
+Sat Nov 17 18:26:45 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/Makefile.am gtk/gtkmarshal.list gtk/gtkmarshalers.list
+       gtk/*.c gtk/gtksignal.h: Make gtkmarshal.list/gtkmarshal.h
+       only for compatibility with GTK+-1.2; and deprecate it; 
+       put all marshalers we actually use into gtkmarshalers.list 
+       and use the _gtk_marshal_ prefix for these marshalers.
+
 2001-11-17  Murray Cumming  <murrayc@usa.net>
 
        * gtk/gtktexttagtable.c (gtk_text_tag_table_class_init):
index e72cf1db7fadcaf2e5676e84c5906a096cc6460a..e89d3ff5e9fcee32c439544c263397f8f8ae4024 100644 (file)
@@ -1,3 +1,11 @@
+Sat Nov 17 18:26:45 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/Makefile.am gtk/gtkmarshal.list gtk/gtkmarshalers.list
+       gtk/*.c gtk/gtksignal.h: Make gtkmarshal.list/gtkmarshal.h
+       only for compatibility with GTK+-1.2; and deprecate it; 
+       put all marshalers we actually use into gtkmarshalers.list 
+       and use the _gtk_marshal_ prefix for these marshalers.
+
 2001-11-17  Murray Cumming  <murrayc@usa.net>
 
        * gtk/gtktexttagtable.c (gtk_text_tag_table_class_init):
index e72cf1db7fadcaf2e5676e84c5906a096cc6460a..e89d3ff5e9fcee32c439544c263397f8f8ae4024 100644 (file)
@@ -1,3 +1,11 @@
+Sat Nov 17 18:26:45 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/Makefile.am gtk/gtkmarshal.list gtk/gtkmarshalers.list
+       gtk/*.c gtk/gtksignal.h: Make gtkmarshal.list/gtkmarshal.h
+       only for compatibility with GTK+-1.2; and deprecate it; 
+       put all marshalers we actually use into gtkmarshalers.list 
+       and use the _gtk_marshal_ prefix for these marshalers.
+
 2001-11-17  Murray Cumming  <murrayc@usa.net>
 
        * gtk/gtktexttagtable.c (gtk_text_tag_table_class_init):
index e72cf1db7fadcaf2e5676e84c5906a096cc6460a..e89d3ff5e9fcee32c439544c263397f8f8ae4024 100644 (file)
@@ -1,3 +1,11 @@
+Sat Nov 17 18:26:45 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/Makefile.am gtk/gtkmarshal.list gtk/gtkmarshalers.list
+       gtk/*.c gtk/gtksignal.h: Make gtkmarshal.list/gtkmarshal.h
+       only for compatibility with GTK+-1.2; and deprecate it; 
+       put all marshalers we actually use into gtkmarshalers.list 
+       and use the _gtk_marshal_ prefix for these marshalers.
+
 2001-11-17  Murray Cumming  <murrayc@usa.net>
 
        * gtk/gtktexttagtable.c (gtk_text_tag_table_class_init):
index e72cf1db7fadcaf2e5676e84c5906a096cc6460a..e89d3ff5e9fcee32c439544c263397f8f8ae4024 100644 (file)
@@ -1,3 +1,11 @@
+Sat Nov 17 18:26:45 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/Makefile.am gtk/gtkmarshal.list gtk/gtkmarshalers.list
+       gtk/*.c gtk/gtksignal.h: Make gtkmarshal.list/gtkmarshal.h
+       only for compatibility with GTK+-1.2; and deprecate it; 
+       put all marshalers we actually use into gtkmarshalers.list 
+       and use the _gtk_marshal_ prefix for these marshalers.
+
 2001-11-17  Murray Cumming  <murrayc@usa.net>
 
        * gtk/gtktexttagtable.c (gtk_text_tag_table_class_init):
index bbe5fa6fe230e668ecfa5547738fd8847f4f9f28..27d9e4bd35fdf46a92c5b88c74169016870fb478 100644 (file)
@@ -313,6 +313,8 @@ gtk_c_sources = @STRIP_BEGIN@   \
        gtklistitem.c           \
        gtkliststore.c          \
        gtkmain.c               \
+       gtkmarshalers.c         \
+       gtkmarshal.c            \
        gtkmenu.c               \
        gtkmenubar.c            \
        gtkmenuitem.c           \
@@ -418,10 +420,12 @@ gtk_built_public_sources = @STRIP_BEGIN@ \
 gtk_built_sources = @STRIP_BEGIN@ \
        stamp-gtk.defs          \
        stamp-gtktypebuiltins.h \
-       stamp-gtkmarshal.h      \
+       stamp-gtkmarshalers.h   \
        gtktypebuiltins_vars.c  \
        gtktypebuiltins_ids.c   \
        gtktypebuiltins_evals.c \
+       gtkmarshalers.c         \
+       gtkmarshalers.h         \
        gtkmarshal.c            \
        gtk.defs                \
        ${gtk_built_public_sources} \
@@ -434,7 +438,7 @@ gtk_extra_sources = @STRIP_BEGIN@ \
        maketypes.awk           \
        makeenums.h             \
        gtk-boxed.defs          \
-       gtkmarshal.list         \
+       gtkmarshalers.list              \
 @STRIP_END@
 
 #
@@ -457,7 +461,7 @@ Makefile: oldest-source-stamp       # oh boy, does automake SUCK!
 oldest-source-stamp: $(gtk_built_sources)
 $(OBJECTS): oldest-source-stamp  ${gtk_built_public_sources} # this is our oldest file, used for implicit auto-generation deps
 # initial creation of the real stamp-* files
-gtk.defs gtkmarshal.h gtktypebuiltins.h:          # never add deps here
+gtk.defs gtkmarshalers.h gtktypebuiltins.h:          # never add deps here
        test -f "$(srcdir)/$@" || touch $(srcdir)/$@
 # normal autogeneration rules
 # all autogenerated files need to be generated in the srcdir,
@@ -481,25 +485,47 @@ $(srcdir)/stamp-gtk.defs: @REBUILD@ gtk.defs gtk-boxed.defs $(gtk_public_h_sourc
        && (cmp -s xgen-gdef gtk.defs || cp xgen-gdef gtk.defs) \
        && rm -f xgen-gdef \
        && echo timestamp > $(@F)
-$(srcdir)/stamp-gtkmarshal.h: @REBUILD@ gtkmarshal.list gtkmarshal.h
-       case @GLIB_GENMARSHAL@ in                                                                       \
-          .*) glib_genmarshal=`pwd`/@GLIB_GENMARSHAL@ ;;                               \
-          *) glib_genmarshal=@GLIB_GENMARSHAL@ ;;                                                      \
-       esac;                                                                                           \
-       cd $(srcdir) \
-       && $$glib_genmarshal --prefix=gtk_marshal gtkmarshal.list --header >> xgen-gmh \
-       && (cmp -s xgen-gmh gtkmarshal.h || cp xgen-gmh gtkmarshal.h) \
-       && rm -f xgen-gmh xgen-gmh~ \
+
+$(srcdir)/stamp-gtkmarshalers.h: @REBUILD@ gtkmarshalers.list gtkmarshalers.h
+       case @GLIB_GENMARSHAL@ in                                                               \
+          .*) glib_genmarshal=`pwd`/@GLIB_GENMARSHAL@ ;;                                       \
+          *) glib_genmarshal=@GLIB_GENMARSHAL@ ;;                                              \
+       esac;                                                                                   \
+       cd $(srcdir)                                                                            \
+       && $$glib_genmarshal --prefix=_gtk_marshal gtkmarshalers.list --header >> xgen-gmh      \
+       && (cmp -s xgen-gmh gtkmarshalers.h || cp xgen-gmh gtkmarshalers.h)                     \
+       && rm -f xgen-gmh xgen-gmh~                                                             \
        && echo timestamp > $(@F)
-$(srcdir)/gtkmarshal.c: @REBUILD@ $(srcdir)/stamp-gtkmarshal.h
-       case @GLIB_GENMARSHAL@ in                                                                       \
-          .*) glib_genmarshal=`pwd`/@GLIB_GENMARSHAL@ ;;                               \
-          *) glib_genmarshal=@GLIB_GENMARSHAL@ ;;                                                      \
-       esac;                                                                                           \
-       cd $(srcdir) \
-       && $$glib_genmarshal --prefix=gtk_marshal gtkmarshal.list --body >> xgen-gmc \
-       && cp xgen-gmc gtkmarshal.c \
+$(srcdir)/gtkmarshalers.c: @REBUILD@ $(srcdir)/stamp-gtkmarshalers.h
+       case @GLIB_GENMARSHAL@ in                                                               \
+          .*) glib_genmarshal=`pwd`/@GLIB_GENMARSHAL@ ;;                                       \
+          *) glib_genmarshal=@GLIB_GENMARSHAL@ ;;                                              \
+       esac;                                                                                   \
+       cd $(srcdir)                                                                            \
+       && $$glib_genmarshal --prefix=_gtk_marshal gtkmarshalers.list --body >> xgen-gmc        \
+       && cp xgen-gmc gtkmarshalers.c                                                          \
        && rm -f xgen-gmc xgen-gmc~
+$(srcdir)/gtkmarshal.h: @REBUILD@ gtkmarshal.list
+       case @GLIB_GENMARSHAL@ in                                                               \
+          .*) glib_genmarshal=`pwd`/@GLIB_GENMARSHAL@ ;;                                       \
+          *) glib_genmarshal=@GLIB_GENMARSHAL@ ;;                                              \
+       esac;                                                                                   \
+       cd $(srcdir)                                                                            \
+       && echo "#ifndef GTK_DISABLE_DEPRECATED" > xgen-gmh                                     \
+        && $$glib_genmarshal --prefix=gtk_marshal gtkmarshal.list --header >> xgen-gmh         \
+       && echo "#endif /* GTK_DISABLE_DEPRECATED */" >> xgen-gmh                               \
+       && cp xgen-gmh gtkmarshal.h                                                             \
+       && rm -f xgen-gmh xgen-gmh~
+$(srcdir)/gtkmarshal.c: @REBUILD@ gtkmarshal.h
+       case @GLIB_GENMARSHAL@ in                                                               \
+          .*) glib_genmarshal=`pwd`/@GLIB_GENMARSHAL@ ;;                                       \
+          *) glib_genmarshal=@GLIB_GENMARSHAL@ ;;                                              \
+       esac;                                                                                   \
+       cd $(srcdir)                                                                            \
+       && $$glib_genmarshal --prefix=gtk_marshal gtkmarshal.list --body >> xgen-gmc            \
+       && cp xgen-gmc gtkmarshal.c                                                             \
+       && rm -f xgen-gmc xgen-gmc~
+
 $(srcdir)/stamp-gtktypebuiltins.h: @REBUILD@ maketypes.awk $(srcdir)/stamp-gtk.defs gtktypebuiltins.h
        cd $(srcdir) \
        && LC_ALL=C $(AWK) -f maketypes.awk gtk.defs macros > xgen-gtbh \
index a8c36b76436fe12227e55ccda93559ed32e18ec0..7d5ec04b8f9c75c51ddf390c9de027651eaf065e 100644 (file)
@@ -26,6 +26,7 @@
 #include "gtkaccelgroup.h"
 #include "gtkaccelmap.h"
 #include "gdk/gdkkeysyms.h"
+#include "gtkmarshalers.h"
 #include "gtksignal.h"
 
 #include <ctype.h>
@@ -119,14 +120,14 @@ gtk_accel_group_class_init (GtkAccelGroupClass *class)
                                        G_SIGNAL_DETAILED,
                                        0,
                                        accel_activate_accumulator, NULL,
-                                       gtk_marshal_BOOLEAN__OBJECT_UINT_UINT,
+                                       _gtk_marshal_BOOLEAN__OBJECT_UINT_UINT,
                                        G_TYPE_BOOLEAN, 3, G_TYPE_OBJECT, G_TYPE_UINT, G_TYPE_UINT);
   signal_accel_changed = g_signal_new ("accel_changed",
                                       G_OBJECT_CLASS_TYPE (class),
                                       G_SIGNAL_RUN_FIRST | G_SIGNAL_DETAILED,
                                       G_STRUCT_OFFSET (GtkAccelGroupClass, accel_changed),
                                       NULL, NULL,
-                                      gtk_marshal_VOID__UINT_UINT_BOXED,
+                                      _gtk_marshal_VOID__UINT_UINT_BOXED,
                                       G_TYPE_NONE, 3, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_CLOSURE);
 }
 
index 6e902276a1291a2b08dd0d996c3f034ba833f208..0c6cf648da91870e58877d20b9740d3abfbbc8b6 100644 (file)
@@ -25,6 +25,7 @@
  */
 
 #include "gtkadjustment.h"
+#include "gtkmarshalers.h"
 #include "gtksignal.h"
 
 
@@ -82,14 +83,14 @@ gtk_adjustment_class_init (GtkAdjustmentClass *class)
                     GTK_RUN_FIRST | GTK_RUN_NO_RECURSE,
                     GTK_CLASS_TYPE (object_class),
                     GTK_SIGNAL_OFFSET (GtkAdjustmentClass, changed),
-                    gtk_marshal_VOID__VOID,
+                    _gtk_marshal_VOID__VOID,
                    GTK_TYPE_NONE, 0);
   adjustment_signals[VALUE_CHANGED] =
     gtk_signal_new ("value_changed",
                     GTK_RUN_FIRST | GTK_RUN_NO_RECURSE,
                     GTK_CLASS_TYPE (object_class),
                     GTK_SIGNAL_OFFSET (GtkAdjustmentClass, value_changed),
-                    gtk_marshal_VOID__VOID,
+                    _gtk_marshal_VOID__VOID,
                    GTK_TYPE_NONE, 0);
 }
 
index 0e805768dcc8b80c14c528881b380787918918f3..81d92113e921da96a095ab78ee42d5655ee38611 100644 (file)
@@ -29,6 +29,7 @@
 #include "gtkbutton.h"
 #include "gtklabel.h"
 #include "gtkmain.h"
+#include "gtkmarshalers.h"
 #include "gtksignal.h"
 #include "gtkimage.h"
 #include "gtkhbox.h"
@@ -219,42 +220,42 @@ gtk_button_class_init (GtkButtonClass *klass)
                     GTK_RUN_FIRST,
                     GTK_CLASS_TYPE (object_class),
                     GTK_SIGNAL_OFFSET (GtkButtonClass, pressed),
-                    gtk_marshal_VOID__VOID,
+                    _gtk_marshal_VOID__VOID,
                    GTK_TYPE_NONE, 0);
   button_signals[RELEASED] =
     gtk_signal_new ("released",
                     GTK_RUN_FIRST,
                     GTK_CLASS_TYPE (object_class),
                     GTK_SIGNAL_OFFSET (GtkButtonClass, released),
-                    gtk_marshal_VOID__VOID,
+                    _gtk_marshal_VOID__VOID,
                    GTK_TYPE_NONE, 0);
   button_signals[CLICKED] =
     gtk_signal_new ("clicked",
                     GTK_RUN_FIRST | GTK_RUN_ACTION,
                     GTK_CLASS_TYPE (object_class),
                     GTK_SIGNAL_OFFSET (GtkButtonClass, clicked),
-                    gtk_marshal_VOID__VOID,
+                    _gtk_marshal_VOID__VOID,
                    GTK_TYPE_NONE, 0);
   button_signals[ENTER] =
     gtk_signal_new ("enter",
                     GTK_RUN_FIRST,
                     GTK_CLASS_TYPE (object_class),
                     GTK_SIGNAL_OFFSET (GtkButtonClass, enter),
-                    gtk_marshal_VOID__VOID,
+                    _gtk_marshal_VOID__VOID,
                    GTK_TYPE_NONE, 0);
   button_signals[LEAVE] =
     gtk_signal_new ("leave",
                     GTK_RUN_FIRST,
                     GTK_CLASS_TYPE (object_class),
                     GTK_SIGNAL_OFFSET (GtkButtonClass, leave),
-                    gtk_marshal_VOID__VOID,
+                    _gtk_marshal_VOID__VOID,
                    GTK_TYPE_NONE, 0);
   button_signals[ACTIVATE] =
     gtk_signal_new ("activate",
                     GTK_RUN_FIRST,
                     GTK_CLASS_TYPE (object_class),
                     GTK_SIGNAL_OFFSET (GtkButtonClass, activate),
-                    gtk_marshal_VOID__VOID,
+                    _gtk_marshal_VOID__VOID,
                    GTK_TYPE_NONE, 0);
   widget_class->activate_signal = button_signals[ACTIVATE];
 
index 158ed5265b5137d0e8bbbb0c67541d4df670538a..5ec354098ae995b46bb53760b3f47d2123481740 100644 (file)
@@ -19,6 +19,7 @@
 
 
 #include "gtkcelleditable.h"
+#include "gtkmarshalers.h"
 #include "gtksignal.h"
 
 static void gtk_cell_editable_base_init (gpointer g_class);
@@ -61,14 +62,14 @@ gtk_cell_editable_base_init (gpointer g_class)
                     G_SIGNAL_RUN_LAST,
                     G_STRUCT_OFFSET (GtkCellEditableIface, editing_done),
                     NULL, NULL,
-                    gtk_marshal_VOID__VOID,
+                    _gtk_marshal_VOID__VOID,
                     G_TYPE_NONE, 0);
       g_signal_new ("remove_widget",
                     GTK_TYPE_CELL_EDITABLE,
                     G_SIGNAL_RUN_LAST,
                     G_STRUCT_OFFSET (GtkCellEditableIface, remove_widget),
                     NULL, NULL,
-                    gtk_marshal_VOID__VOID,
+                    _gtk_marshal_VOID__VOID,
                     G_TYPE_NONE, 0);
       initialized = TRUE;
     }
index 62086cdd11cb55a563da81b1ee4c37f279a972af..b64a0e0dbbc85a6d44127ac2b5d0a21efd11db04 100644 (file)
@@ -21,6 +21,7 @@
 #include "gtkcellrenderertext.h"
 #include "gtkeditable.h"
 #include "gtkentry.h"
+#include "gtkmarshalers.h"
 #include "gtksignal.h"
 #include "gtkintl.h"
 
@@ -413,7 +414,7 @@ gtk_cell_renderer_text_class_init (GtkCellRendererTextClass *class)
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkCellRendererTextClass, edited),
-                   gtk_marshal_VOID__STRING_STRING,
+                   _gtk_marshal_VOID__STRING_STRING,
                    GTK_TYPE_NONE, 2,
                    G_TYPE_STRING,
                    G_TYPE_STRING);
index 3f7b054d73d543b44de14e747300b934c7e1d86e..79ca1cd37fefdc682d3c9b9669047f9c860d627c 100644 (file)
@@ -21,6 +21,7 @@
 #include <gtk/gtkcellrenderertoggle.h>
 #include <gtk/gtksignal.h>
 #include "gtkintl.h"
+#include "gtkmarshalers.h"
 
 static void gtk_cell_renderer_toggle_get_property  (GObject                    *object,
                                                    guint                       param_id,
@@ -156,7 +157,7 @@ gtk_cell_renderer_toggle_class_init (GtkCellRendererToggleClass *class)
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkCellRendererToggleClass, toggled),
-                   gtk_marshal_VOID__STRING,
+                   _gtk_marshal_VOID__STRING,
                    GTK_TYPE_NONE, 1,
                    GTK_TYPE_STRING);
 }
index 59bc0cd1d35fca52c49a678f3aab9b385c6a620e..3669304843b3a6d15c6be27a2aae2fbac901ec9b 100644 (file)
@@ -28,6 +28,7 @@
 #include "gtkaccellabel.h"
 #include "gtksignal.h"
 #include "gtkintl.h"
+#include "gtkmarshalers.h"
 
 #define CHECK_TOGGLE_SIZE 12
 
@@ -138,7 +139,7 @@ gtk_check_menu_item_class_init (GtkCheckMenuItemClass *klass)
                     GTK_RUN_FIRST,
                     GTK_CLASS_TYPE (object_class),
                     GTK_SIGNAL_OFFSET (GtkCheckMenuItemClass, toggled),
-                    gtk_marshal_VOID__VOID,
+                    _gtk_marshal_VOID__VOID,
                    GTK_TYPE_NONE, 0);
 }
 
index 856eb3172e1c5728479f9ea8d7d2083a4d9434d6..f4224a9c5a3e23106f7b0a53e07bd7b65552e265 100644 (file)
@@ -32,6 +32,7 @@
 #include "gtkclist.h"
 #include "gtkbindings.h"
 #include "gtkdnd.h"
+#include "gtkmarshalers.h"
 #include <gdk/gdkkeysyms.h>
 
 /* length of button_actions array */
@@ -606,7 +607,7 @@ gtk_clist_class_init (GtkCListClass *klass)
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkCListClass, set_scroll_adjustments),
-                   gtk_marshal_VOID__OBJECT_OBJECT,
+                   _gtk_marshal_VOID__OBJECT_OBJECT,
                    GTK_TYPE_NONE, 2, GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT);
 
   clist_signals[SELECT_ROW] =
@@ -614,7 +615,7 @@ gtk_clist_class_init (GtkCListClass *klass)
                    GTK_RUN_FIRST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkCListClass, select_row),
-                   gtk_marshal_VOID__INT_INT_BOXED,
+                   _gtk_marshal_VOID__INT_INT_BOXED,
                    GTK_TYPE_NONE, 3,
                    GTK_TYPE_INT,
                    GTK_TYPE_INT,
@@ -624,7 +625,7 @@ gtk_clist_class_init (GtkCListClass *klass)
                    GTK_RUN_FIRST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkCListClass, unselect_row),
-                   gtk_marshal_VOID__INT_INT_BOXED,
+                   _gtk_marshal_VOID__INT_INT_BOXED,
                    GTK_TYPE_NONE, 3, GTK_TYPE_INT,
                    GTK_TYPE_INT, GDK_TYPE_EVENT);
   clist_signals[ROW_MOVE] =
@@ -632,21 +633,21 @@ gtk_clist_class_init (GtkCListClass *klass)
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkCListClass, row_move),
-                   gtk_marshal_VOID__INT_INT,
+                   _gtk_marshal_VOID__INT_INT,
                    GTK_TYPE_NONE, 2, GTK_TYPE_INT, GTK_TYPE_INT);
   clist_signals[CLICK_COLUMN] =
     gtk_signal_new ("click_column",
                    GTK_RUN_FIRST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkCListClass, click_column),
-                   gtk_marshal_VOID__INT,
+                   _gtk_marshal_VOID__INT,
                    GTK_TYPE_NONE, 1, GTK_TYPE_INT);
   clist_signals[RESIZE_COLUMN] =
     gtk_signal_new ("resize_column",
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkCListClass, resize_column),
-                   gtk_marshal_VOID__INT_INT,
+                   _gtk_marshal_VOID__INT_INT,
                    GTK_TYPE_NONE, 2, GTK_TYPE_INT, GTK_TYPE_INT);
 
   clist_signals[TOGGLE_FOCUS_ROW] =
@@ -654,56 +655,56 @@ gtk_clist_class_init (GtkCListClass *klass)
                     GTK_RUN_LAST | GTK_RUN_ACTION,
                     GTK_CLASS_TYPE (object_class),
                     GTK_SIGNAL_OFFSET (GtkCListClass, toggle_focus_row),
-                    gtk_marshal_VOID__VOID,
+                    _gtk_marshal_VOID__VOID,
                     GTK_TYPE_NONE, 0);
   clist_signals[SELECT_ALL] =
     gtk_signal_new ("select_all",
                     GTK_RUN_LAST | GTK_RUN_ACTION,
                     GTK_CLASS_TYPE (object_class),
                     GTK_SIGNAL_OFFSET (GtkCListClass, select_all),
-                    gtk_marshal_VOID__VOID,
+                    _gtk_marshal_VOID__VOID,
                     GTK_TYPE_NONE, 0);
   clist_signals[UNSELECT_ALL] =
     gtk_signal_new ("unselect_all",
                     GTK_RUN_LAST | GTK_RUN_ACTION,
                     GTK_CLASS_TYPE (object_class),
                     GTK_SIGNAL_OFFSET (GtkCListClass, unselect_all),
-                    gtk_marshal_VOID__VOID,
+                    _gtk_marshal_VOID__VOID,
                     GTK_TYPE_NONE, 0);
   clist_signals[UNDO_SELECTION] =
     gtk_signal_new ("undo_selection",
                    GTK_RUN_LAST | GTK_RUN_ACTION,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkCListClass, undo_selection),
-                   gtk_marshal_VOID__VOID,
+                   _gtk_marshal_VOID__VOID,
                    GTK_TYPE_NONE, 0);
   clist_signals[START_SELECTION] =
     gtk_signal_new ("start_selection",
                    GTK_RUN_LAST | GTK_RUN_ACTION,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkCListClass, start_selection),
-                   gtk_marshal_VOID__VOID,
+                   _gtk_marshal_VOID__VOID,
                    GTK_TYPE_NONE, 0);
   clist_signals[END_SELECTION] =
     gtk_signal_new ("end_selection",
                    GTK_RUN_LAST | GTK_RUN_ACTION,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkCListClass, end_selection),
-                   gtk_marshal_VOID__VOID,
+                   _gtk_marshal_VOID__VOID,
                    GTK_TYPE_NONE, 0);
   clist_signals[TOGGLE_ADD_MODE] =
     gtk_signal_new ("toggle_add_mode",
                    GTK_RUN_LAST | GTK_RUN_ACTION,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkCListClass, toggle_add_mode),
-                   gtk_marshal_VOID__VOID,
+                   _gtk_marshal_VOID__VOID,
                    GTK_TYPE_NONE, 0);
   clist_signals[EXTEND_SELECTION] =
     gtk_signal_new ("extend_selection",
                     GTK_RUN_LAST | GTK_RUN_ACTION,
                     GTK_CLASS_TYPE (object_class),
                     GTK_SIGNAL_OFFSET (GtkCListClass, extend_selection),
-                    gtk_marshal_VOID__ENUM_FLOAT_BOOL,
+                    _gtk_marshal_VOID__ENUM_FLOAT_BOOLEAN,
                     GTK_TYPE_NONE, 3,
                    GTK_TYPE_SCROLL_TYPE, GTK_TYPE_FLOAT, GTK_TYPE_BOOL);
   clist_signals[SCROLL_VERTICAL] =
@@ -711,21 +712,21 @@ gtk_clist_class_init (GtkCListClass *klass)
                     GTK_RUN_LAST | GTK_RUN_ACTION,
                     GTK_CLASS_TYPE (object_class),
                     GTK_SIGNAL_OFFSET (GtkCListClass, scroll_vertical),
-                    gtk_marshal_VOID__ENUM_FLOAT,
+                    _gtk_marshal_VOID__ENUM_FLOAT,
                     GTK_TYPE_NONE, 2, GTK_TYPE_SCROLL_TYPE, GTK_TYPE_FLOAT);
   clist_signals[SCROLL_HORIZONTAL] =
     gtk_signal_new ("scroll_horizontal",
                     GTK_RUN_LAST | GTK_RUN_ACTION,
                     GTK_CLASS_TYPE (object_class),
                     GTK_SIGNAL_OFFSET (GtkCListClass, scroll_horizontal),
-                    gtk_marshal_VOID__ENUM_FLOAT,
+                    _gtk_marshal_VOID__ENUM_FLOAT,
                     GTK_TYPE_NONE, 2, GTK_TYPE_SCROLL_TYPE, GTK_TYPE_FLOAT);
   clist_signals[ABORT_COLUMN_RESIZE] =
     gtk_signal_new ("abort_column_resize",
                     GTK_RUN_LAST | GTK_RUN_ACTION,
                     GTK_CLASS_TYPE (object_class),
                     GTK_SIGNAL_OFFSET (GtkCListClass, abort_column_resize),
-                    gtk_marshal_VOID__VOID,
+                    _gtk_marshal_VOID__VOID,
                     GTK_TYPE_NONE, 0);
 
   binding_set = gtk_binding_set_by_class (klass);
index 034e6262fc9331c9a1667ea50be6aee08acbd0f0..179765eae3f3ef80d4efc8a7ba0c2838bf79d5b3 100644 (file)
@@ -42,6 +42,7 @@
 #include "gtkframe.h"
 #include "gtktable.h"
 #include "gtklabel.h"
+#include "gtkmarshalers.h"
 #include "gtkpixmap.h"
 #include "gtkspinbutton.h"
 #include "gtkrange.h"
@@ -1701,7 +1702,7 @@ gtk_color_selection_class_init (GtkColorSelectionClass *klass)
                     GTK_RUN_FIRST,
                     GTK_CLASS_TYPE (object_class),
                     GTK_SIGNAL_OFFSET (GtkColorSelectionClass, color_changed),
-                    gtk_marshal_VOID__VOID,
+                    _gtk_marshal_VOID__VOID,
                     GTK_TYPE_NONE, 0);
 
   gtk_settings_install_property (g_param_spec_string ("gtk-color-palette",
index 613eb4a4d32fbe212884ff731909988f10ec3528..efab0a70230748aecc3da3f3c4f95956dbf3ba78 100644 (file)
@@ -32,6 +32,7 @@
 #include "gtkprivate.h"
 #include "gtksignal.h"
 #include "gtkmain.h"
+#include "gtkmarshalers.h"
 #include "gtkwindow.h"
 #include "gtkintl.h"
 #include <gobject/gobjectnotifyqueue.c>
@@ -225,7 +226,7 @@ gtk_container_class_init (GtkContainerClass *class)
                     GTK_RUN_FIRST,
                     GTK_CLASS_TYPE (object_class),
                     GTK_SIGNAL_OFFSET (GtkContainerClass, add),
-                    gtk_marshal_VOID__OBJECT,
+                    _gtk_marshal_VOID__OBJECT,
                    GTK_TYPE_NONE, 1,
                     GTK_TYPE_WIDGET);
   container_signals[REMOVE] =
@@ -233,7 +234,7 @@ gtk_container_class_init (GtkContainerClass *class)
                     GTK_RUN_FIRST,
                     GTK_CLASS_TYPE (object_class),
                     GTK_SIGNAL_OFFSET (GtkContainerClass, remove),
-                    gtk_marshal_VOID__OBJECT,
+                    _gtk_marshal_VOID__OBJECT,
                    GTK_TYPE_NONE, 1,
                     GTK_TYPE_WIDGET);
   container_signals[CHECK_RESIZE] =
@@ -241,14 +242,14 @@ gtk_container_class_init (GtkContainerClass *class)
                     GTK_RUN_LAST,
                     GTK_CLASS_TYPE (object_class),
                     GTK_SIGNAL_OFFSET (GtkContainerClass, check_resize),
-                   gtk_marshal_VOID__VOID,
+                   _gtk_marshal_VOID__VOID,
                    GTK_TYPE_NONE, 0);
   container_signals[SET_FOCUS_CHILD] =
     gtk_signal_new ("set-focus-child",
                     GTK_RUN_FIRST,
                     GTK_CLASS_TYPE (object_class),
                     GTK_SIGNAL_OFFSET (GtkContainerClass, set_focus_child),
-                    gtk_marshal_VOID__OBJECT,
+                    _gtk_marshal_VOID__OBJECT,
                    GTK_TYPE_NONE, 1,
                     GTK_TYPE_WIDGET);
 }
index a52175d5fcab426caad3d16555f225e3e5023af1..9e5c6a33c95e129c69c89946bcb85d64da15abdd 100644 (file)
@@ -32,6 +32,7 @@
 #include "gtkctree.h"
 #include "gtkbindings.h"
 #include "gtkmain.h"
+#include "gtkmarshalers.h"
 #include "gtkdnd.h"
 #include <gdk/gdkkeysyms.h>
 
@@ -432,7 +433,7 @@ gtk_ctree_class_init (GtkCTreeClass *klass)
                    GTK_RUN_FIRST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkCTreeClass, tree_select_row),
-                   gtk_marshal_VOID__POINTER_INT,
+                   _gtk_marshal_VOID__POINTER_INT,
                    GTK_TYPE_NONE, 2,
                    GTK_TYPE_CTREE_NODE,
                    GTK_TYPE_INT);
@@ -441,7 +442,7 @@ gtk_ctree_class_init (GtkCTreeClass *klass)
                    GTK_RUN_FIRST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkCTreeClass, tree_unselect_row),
-                   gtk_marshal_VOID__POINTER_INT,
+                   _gtk_marshal_VOID__POINTER_INT,
                    GTK_TYPE_NONE, 2,
                    GTK_TYPE_CTREE_NODE,
                    GTK_TYPE_INT);
@@ -450,7 +451,7 @@ gtk_ctree_class_init (GtkCTreeClass *klass)
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkCTreeClass, tree_expand),
-                   gtk_marshal_VOID__POINTER,
+                   _gtk_marshal_VOID__POINTER,
                    GTK_TYPE_NONE, 1,
                    GTK_TYPE_CTREE_NODE);
   ctree_signals[TREE_COLLAPSE] =
@@ -458,7 +459,7 @@ gtk_ctree_class_init (GtkCTreeClass *klass)
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkCTreeClass, tree_collapse),
-                   gtk_marshal_VOID__POINTER,
+                   _gtk_marshal_VOID__POINTER,
                    GTK_TYPE_NONE, 1,
                    GTK_TYPE_CTREE_NODE);
   ctree_signals[TREE_MOVE] =
@@ -466,7 +467,7 @@ gtk_ctree_class_init (GtkCTreeClass *klass)
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkCTreeClass, tree_move),
-                   gtk_marshal_VOID__POINTER_POINTER_POINTER,
+                   _gtk_marshal_VOID__POINTER_POINTER_POINTER,
                    GTK_TYPE_NONE, 3,
                    GTK_TYPE_CTREE_NODE,
                    GTK_TYPE_CTREE_NODE,
@@ -477,7 +478,7 @@ gtk_ctree_class_init (GtkCTreeClass *klass)
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkCTreeClass,
                                       change_focus_row_expansion),
-                   gtk_marshal_VOID__ENUM,
+                   _gtk_marshal_VOID__ENUM,
                    GTK_TYPE_NONE, 1, GTK_TYPE_CTREE_EXPANSION_TYPE);
 
   binding_set = gtk_binding_set_by_class (klass);
index 38c74a07fd89932f78bb8e07220d4dc3885b006c..71d47f52326a79201048674209a74459b83fa6b1 100644 (file)
@@ -31,6 +31,7 @@
 #include "gtkcurve.h"
 #include "gtkdrawingarea.h"
 #include "gtkmain.h"
+#include "gtkmarshalers.h"
 #include "gtkradiobutton.h"
 #include "gtksignal.h"
 #include "gtktable.h"
@@ -167,7 +168,7 @@ gtk_curve_class_init (GtkCurveClass *class)
   curve_type_changed_signal =
     gtk_signal_new ("curve_type_changed", GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkCurveClass, curve_type_changed),
-                   gtk_marshal_VOID__VOID, GTK_TYPE_NONE, 0);
+                   _gtk_marshal_VOID__VOID, GTK_TYPE_NONE, 0);
 }
 
 static void
index 61d4bfc05f409113910d880db1b1579c8d3cf32e..b914211f3af0dccbeeb7a990b64cf3696f5f3596 100644 (file)
@@ -28,6 +28,7 @@
 #include "gtkdialog.h"
 #include "gtkhbbox.h"
 #include "gtkhseparator.h"
+#include "gtkmarshalers.h"
 #include "gtkvbox.h"
 #include "gtksignal.h"
 #include "gdkkeysyms.h"
@@ -132,7 +133,7 @@ gtk_dialog_class_init (GtkDialogClass *class)
                     GTK_RUN_LAST,
                     GTK_CLASS_TYPE (object_class),
                     GTK_SIGNAL_OFFSET (GtkDialogClass, response),
-                    gtk_marshal_NONE__INT,
+                    _gtk_marshal_NONE__INT,
                    GTK_TYPE_NONE, 1,
                     GTK_TYPE_INT);
 
@@ -141,7 +142,7 @@ gtk_dialog_class_init (GtkDialogClass *class)
                     GTK_RUN_LAST | GTK_RUN_ACTION,
                     GTK_CLASS_TYPE (object_class),
                     GTK_SIGNAL_OFFSET (GtkDialogClass, close),
-                    gtk_marshal_NONE__NONE,
+                    _gtk_marshal_NONE__NONE,
                    GTK_TYPE_NONE, 0);
   
   gtk_widget_class_install_style_property (widget_class,
index 8b41572e1c467f6728b9e0db17c5df0ed10ba5e8..40428d29c347bf8727aae5e7be9557ebc22b42f5 100644 (file)
@@ -27,6 +27,7 @@
 #include <string.h>
 
 #include "gtkeditable.h"
+#include "gtkmarshalers.h"
 #include "gtksignal.h"
 
 
@@ -65,7 +66,7 @@ gtk_editable_base_init (gpointer g_class)
                    G_SIGNAL_RUN_LAST,
                    G_STRUCT_OFFSET (GtkEditableClass, insert_text),
                    NULL, NULL,
-                   gtk_marshal_VOID__STRING_INT_POINTER,
+                   _gtk_marshal_VOID__STRING_INT_POINTER,
                    G_TYPE_NONE, 3,
                    GTK_TYPE_STRING,
                    GTK_TYPE_INT,
@@ -75,7 +76,7 @@ gtk_editable_base_init (gpointer g_class)
                    G_SIGNAL_RUN_LAST,
                    G_STRUCT_OFFSET (GtkEditableClass, delete_text),
                    NULL, NULL,
-                   gtk_marshal_VOID__INT_INT,
+                   _gtk_marshal_VOID__INT_INT,
                    GTK_TYPE_NONE, 2,
                    GTK_TYPE_INT,
                    GTK_TYPE_INT);
@@ -84,7 +85,7 @@ gtk_editable_base_init (gpointer g_class)
                    G_SIGNAL_RUN_LAST,
                    G_STRUCT_OFFSET (GtkEditableClass, changed),
                    NULL, NULL,
-                   gtk_marshal_VOID__VOID,
+                   _gtk_marshal_VOID__VOID,
                    GTK_TYPE_NONE, 0);
 
       initialized = TRUE;
index 8aed5b169cc2cb7a063fa8bcd5c2c60aed3c3af7..f64791704734b5ab57eadbfad9932a51e1fb14d4 100644 (file)
@@ -38,6 +38,7 @@
 #include "gtkimmulticontext.h"
 #include "gtkintl.h"
 #include "gtkmain.h"
+#include "gtkmarshalers.h"
 #include "gtkmenu.h"
 #include "gtkmenuitem.h"
 #include "gtkseparatormenuitem.h"
@@ -519,7 +520,7 @@ gtk_entry_class_init (GtkEntryClass *class)
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkEntryClass, populate_popup),
-                   gtk_marshal_VOID__OBJECT,
+                   _gtk_marshal_VOID__OBJECT,
                    GTK_TYPE_NONE, 1, GTK_TYPE_MENU);
   
  /* Action signals */
@@ -529,7 +530,7 @@ gtk_entry_class_init (GtkEntryClass *class)
                    GTK_RUN_LAST | GTK_RUN_ACTION,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkEntryClass, activate),
-                   gtk_marshal_VOID__VOID,
+                   _gtk_marshal_VOID__VOID,
                    GTK_TYPE_NONE, 0);
   widget_class->activate_signal = signals[ACTIVATE];
 
@@ -538,7 +539,7 @@ gtk_entry_class_init (GtkEntryClass *class)
                       GTK_RUN_LAST | GTK_RUN_ACTION,
                       GTK_CLASS_TYPE (object_class),
                       GTK_SIGNAL_OFFSET (GtkEntryClass, move_cursor),
-                      gtk_marshal_VOID__ENUM_INT_BOOLEAN,
+                      _gtk_marshal_VOID__ENUM_INT_BOOLEAN,
                       GTK_TYPE_NONE, 3, GTK_TYPE_MOVEMENT_STEP, GTK_TYPE_INT, GTK_TYPE_BOOL);
 
   signals[INSERT_AT_CURSOR] = 
@@ -546,7 +547,7 @@ gtk_entry_class_init (GtkEntryClass *class)
                       GTK_RUN_LAST | GTK_RUN_ACTION,
                       GTK_CLASS_TYPE (object_class),
                       GTK_SIGNAL_OFFSET (GtkEntryClass, insert_at_cursor),
-                      gtk_marshal_VOID__STRING,
+                      _gtk_marshal_VOID__STRING,
                       GTK_TYPE_NONE, 1, GTK_TYPE_STRING);
 
   signals[DELETE_FROM_CURSOR] = 
@@ -554,7 +555,7 @@ gtk_entry_class_init (GtkEntryClass *class)
                       GTK_RUN_LAST | GTK_RUN_ACTION,
                       GTK_CLASS_TYPE (object_class),
                       GTK_SIGNAL_OFFSET (GtkEntryClass, delete_from_cursor),
-                      gtk_marshal_VOID__ENUM_INT,
+                      _gtk_marshal_VOID__ENUM_INT,
                       GTK_TYPE_NONE, 2, GTK_TYPE_DELETE_TYPE, GTK_TYPE_INT);
 
   signals[CUT_CLIPBOARD] =
@@ -562,7 +563,7 @@ gtk_entry_class_init (GtkEntryClass *class)
                     GTK_RUN_LAST | GTK_RUN_ACTION,
                     GTK_CLASS_TYPE (object_class),
                     GTK_SIGNAL_OFFSET (GtkEntryClass, cut_clipboard),
-                    gtk_marshal_VOID__VOID,
+                    _gtk_marshal_VOID__VOID,
                     GTK_TYPE_NONE, 0);
 
   signals[COPY_CLIPBOARD] =
@@ -570,7 +571,7 @@ gtk_entry_class_init (GtkEntryClass *class)
                     GTK_RUN_LAST | GTK_RUN_ACTION,
                     GTK_CLASS_TYPE (object_class),
                     GTK_SIGNAL_OFFSET (GtkEntryClass, copy_clipboard),
-                    gtk_marshal_VOID__VOID,
+                    _gtk_marshal_VOID__VOID,
                     GTK_TYPE_NONE, 0);
 
   signals[PASTE_CLIPBOARD] =
@@ -578,7 +579,7 @@ gtk_entry_class_init (GtkEntryClass *class)
                     GTK_RUN_LAST | GTK_RUN_ACTION,
                     GTK_CLASS_TYPE (object_class),
                     GTK_SIGNAL_OFFSET (GtkEntryClass, paste_clipboard),
-                    gtk_marshal_VOID__VOID,
+                    _gtk_marshal_VOID__VOID,
                     GTK_TYPE_NONE, 0);
 
   signals[TOGGLE_OVERWRITE] =
@@ -586,7 +587,7 @@ gtk_entry_class_init (GtkEntryClass *class)
                     GTK_RUN_LAST | GTK_RUN_ACTION,
                     GTK_CLASS_TYPE (object_class),
                     GTK_SIGNAL_OFFSET (GtkEntryClass, toggle_overwrite),
-                    gtk_marshal_VOID__VOID,
+                    _gtk_marshal_VOID__VOID,
                     GTK_TYPE_NONE, 0);
 
   /*
index 3a773269bf7ff215e5c88f781b0cf0af295ec762..4924f07b81af361a33e76e09d01c25d2f7d8585c 100644 (file)
@@ -28,6 +28,7 @@
 #include <stdlib.h>
 #include "gtkhandlebox.h"
 #include "gtkmain.h"
+#include "gtkmarshalers.h"
 #include "gtksignal.h"
 #include "gtkwindow.h"
 #include "gtkintl.h"
@@ -237,7 +238,7 @@ gtk_handle_box_class_init (GtkHandleBoxClass *class)
                    GTK_RUN_FIRST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkHandleBoxClass, child_attached),
-                   gtk_marshal_VOID__OBJECT,
+                   _gtk_marshal_VOID__OBJECT,
                    GTK_TYPE_NONE, 1,
                    GTK_TYPE_WIDGET);
   handle_box_signals[SIGNAL_CHILD_DETACHED] =
@@ -245,7 +246,7 @@ gtk_handle_box_class_init (GtkHandleBoxClass *class)
                    GTK_RUN_FIRST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkHandleBoxClass, child_detached),
-                   gtk_marshal_VOID__OBJECT,
+                   _gtk_marshal_VOID__OBJECT,
                    GTK_TYPE_NONE, 1,
                    GTK_TYPE_WIDGET);
 }
index a30d9fa068e58480a0f8d4e321e06bb8524998cb..db030e63b3d5cab85e9428c3bf2e37341e5d30fe 100644 (file)
@@ -28,6 +28,7 @@
 #include "gdk/gdkkeysyms.h"
 #include "gtkbindings.h"
 #include "gtkcontainer.h"
+#include "gtkmarshalers.h"
 
 /*
  * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
@@ -181,7 +182,7 @@ gtk_hsv_class_init (GtkHSVClass *class)
                    GTK_RUN_FIRST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkHSVClass, changed),
-                   gtk_marshal_VOID__VOID,
+                   _gtk_marshal_VOID__VOID,
                    GTK_TYPE_NONE, 0);
 
   hsv_signals[MOVE] =
@@ -189,7 +190,7 @@ gtk_hsv_class_init (GtkHSVClass *class)
                    GTK_RUN_LAST | GTK_RUN_ACTION,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkHSVClass, move),
-                   gtk_marshal_VOID__ENUM,
+                   _gtk_marshal_VOID__ENUM,
                    GTK_TYPE_NONE, 1, GTK_TYPE_DIRECTION_TYPE);
 
   binding_set = gtk_binding_set_by_class (class);
index 1e441682afa8cd2611d95a8943e5ab302b9087b1..cc0aa320097c8d2a69885c0cdd3a2f870c613c9f 100644 (file)
@@ -19,6 +19,7 @@
 
 #include "gtkimcontext.h"
 #include "gtkmain.h"           /* For _gtk_boolean_handled_accumulator */
+#include "gtkmarshalers.h"
 #include "gtksignal.h"
 #include "string.h"
 
@@ -96,7 +97,7 @@ gtk_im_context_class_init (GtkIMContextClass *klass)
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkIMContextClass, preedit_start),
-                   gtk_marshal_VOID__VOID,
+                   _gtk_marshal_VOID__VOID,
                    GTK_TYPE_NONE, 0);
   
   im_context_signals[PREEDIT_END] =
@@ -104,7 +105,7 @@ gtk_im_context_class_init (GtkIMContextClass *klass)
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkIMContextClass, preedit_end),
-                   gtk_marshal_VOID__VOID,
+                   _gtk_marshal_VOID__VOID,
                    GTK_TYPE_NONE, 0);
   
   im_context_signals[PREEDIT_CHANGED] =
@@ -112,7 +113,7 @@ gtk_im_context_class_init (GtkIMContextClass *klass)
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkIMContextClass, preedit_changed),
-                   gtk_marshal_VOID__VOID,
+                   _gtk_marshal_VOID__VOID,
                    GTK_TYPE_NONE, 0);
   
   im_context_signals[COMMIT] =
@@ -120,7 +121,7 @@ gtk_im_context_class_init (GtkIMContextClass *klass)
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkIMContextClass, commit),
-                   gtk_marshal_VOID__STRING,
+                   _gtk_marshal_VOID__STRING,
                    GTK_TYPE_NONE, 1,
                    GTK_TYPE_STRING);
 
@@ -130,7 +131,7 @@ gtk_im_context_class_init (GtkIMContextClass *klass)
                   GTK_RUN_LAST,
                   GTK_SIGNAL_OFFSET (GtkIMContextClass, retrieve_surrounding),
                   _gtk_boolean_handled_accumulator, NULL,
-                  gtk_marshal_BOOLEAN__VOID,
+                  _gtk_marshal_BOOLEAN__VOID,
                   GTK_TYPE_BOOL, 0);
   im_context_signals[DELETE_SURROUNDING] =
     g_signal_new ("delete_surrounding",
@@ -138,7 +139,7 @@ gtk_im_context_class_init (GtkIMContextClass *klass)
                   GTK_RUN_LAST,
                   GTK_SIGNAL_OFFSET (GtkIMContextClass, delete_surrounding),
                   _gtk_boolean_handled_accumulator, NULL,
-                  gtk_marshal_BOOLEAN__INT_INT,
+                  _gtk_marshal_BOOLEAN__INT_INT,
                   GTK_TYPE_BOOL, 2,
                   GTK_TYPE_INT,
                  GTK_TYPE_INT);
index bbba66060c5d685b1dd80a32fc861570a192cc7c..353c311281f21371e4f7c83b82000fd31d6ca7e6 100644 (file)
@@ -44,6 +44,7 @@
 #include "gtklabel.h"
 #include "gtklistitem.h"
 #include "gtkmain.h"
+#include "gtkmarshalers.h"
 #include "gtkmenu.h"
 #include "gtkmenuitem.h"
 #include "gtknotebook.h"
@@ -146,7 +147,7 @@ gtk_input_dialog_class_init (GtkInputDialogClass *klass)
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkInputDialogClass, enable_device),
-                   gtk_marshal_VOID__OBJECT,
+                   _gtk_marshal_VOID__OBJECT,
                    GTK_TYPE_NONE, 1, GDK_TYPE_DEVICE);
 
   input_dialog_signals[DISABLE_DEVICE] =
@@ -154,7 +155,7 @@ gtk_input_dialog_class_init (GtkInputDialogClass *klass)
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkInputDialogClass, disable_device),
-                   gtk_marshal_VOID__OBJECT,
+                   _gtk_marshal_VOID__OBJECT,
                    GTK_TYPE_NONE, 1, GDK_TYPE_DEVICE);
 }
 
index 839928cc224df9dcd4e099fbbaeaf3f646c306d5..0038490ec4cef23967bb09355268450e29d5c66b 100644 (file)
@@ -25,6 +25,7 @@
  */
 
 #include "gtkitem.h"
+#include "gtkmarshalers.h"
 #include "gtksignal.h"
 
 
@@ -96,21 +97,21 @@ gtk_item_class_init (GtkItemClass *class)
                     GTK_RUN_FIRST,
                     GTK_CLASS_TYPE (object_class),
                     GTK_SIGNAL_OFFSET (GtkItemClass, select),
-                    gtk_marshal_VOID__VOID,
+                    _gtk_marshal_VOID__VOID,
                    GTK_TYPE_NONE, 0);
   item_signals[DESELECT] =
     gtk_signal_new ("deselect",
                     GTK_RUN_FIRST,
                     GTK_CLASS_TYPE (object_class),
                     GTK_SIGNAL_OFFSET (GtkItemClass, deselect),
-                    gtk_marshal_VOID__VOID,
+                    _gtk_marshal_VOID__VOID,
                    GTK_TYPE_NONE, 0);
   item_signals[TOGGLE] =
     gtk_signal_new ("toggle",
                     GTK_RUN_FIRST,
                     GTK_CLASS_TYPE (object_class),
                     GTK_SIGNAL_OFFSET (GtkItemClass, toggle),
-                    gtk_marshal_VOID__VOID,
+                    _gtk_marshal_VOID__VOID,
                    GTK_TYPE_NONE, 0);
   widget_class->activate_signal = item_signals[TOGGLE];
 }
index 6781a83cddabb3db89ca0ceeb20bfe9faeb14d03..e6d55146b2907f35f1e081fb18c06e1a8f2f57ce 100644 (file)
@@ -27,6 +27,7 @@
 #include <string.h>
 #include "gtklabel.h"
 #include "gtkmain.h"
+#include "gtkmarshalers.h"
 #include "gtksignal.h"
 #include "gtkwindow.h"
 #include "gdk/gdkkeysyms.h"
@@ -256,7 +257,7 @@ gtk_label_class_init (GtkLabelClass *class)
                       GTK_RUN_LAST | GTK_RUN_ACTION,
                       GTK_CLASS_TYPE (object_class),
                       GTK_SIGNAL_OFFSET (GtkLabelClass, move_cursor),
-                      gtk_marshal_VOID__ENUM_INT_BOOLEAN,
+                      _gtk_marshal_VOID__ENUM_INT_BOOLEAN,
                       GTK_TYPE_NONE, 3, GTK_TYPE_MOVEMENT_STEP, GTK_TYPE_INT, GTK_TYPE_BOOL);
   
   signals[COPY_CLIPBOARD] =
@@ -264,7 +265,7 @@ gtk_label_class_init (GtkLabelClass *class)
                     GTK_RUN_LAST | GTK_RUN_ACTION,
                     GTK_CLASS_TYPE (object_class),
                     GTK_SIGNAL_OFFSET (GtkLabelClass, copy_clipboard),
-                    gtk_marshal_VOID__VOID,
+                    _gtk_marshal_VOID__VOID,
                     GTK_TYPE_NONE, 0);
   
   signals[POPULATE_POPUP] =
@@ -272,7 +273,7 @@ gtk_label_class_init (GtkLabelClass *class)
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkLabelClass, populate_popup),
-                   gtk_marshal_VOID__OBJECT,
+                   _gtk_marshal_VOID__OBJECT,
                    GTK_TYPE_NONE, 1, GTK_TYPE_MENU);
 
   g_object_class_install_property (G_OBJECT_CLASS(object_class),
index c28f4a59e1609c2b85433af8d537785b0c49d785..38438a0a8911d56d1e182cc5f97df701b9c19033 100644 (file)
@@ -34,6 +34,7 @@
 #include "gtksignal.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
+#include "gtkmarshalers.h"
 
 typedef struct _GtkLayoutChild   GtkLayoutChild;
 
@@ -640,7 +641,7 @@ gtk_layout_class_init (GtkLayoutClass *class)
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkLayoutClass, set_scroll_adjustments),
-                   gtk_marshal_VOID__OBJECT_OBJECT,
+                   _gtk_marshal_VOID__OBJECT_OBJECT,
                    GTK_TYPE_NONE, 2, GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT);
 }
 
index 52e7f89334192cad1991625347a1ab088212eac2..56ce0321ec4ff933ddc7f0cb4ac940cb035c2c03 100644 (file)
@@ -31,6 +31,7 @@
 #include "gtkmain.h"
 #include "gtksignal.h"
 #include "gtklabel.h"
+#include "gtkmarshalers.h"
 
 enum {
   SELECTION_CHANGED,
@@ -244,14 +245,14 @@ gtk_list_class_init (GtkListClass *class)
                    GTK_RUN_FIRST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkListClass, selection_changed),
-                   gtk_marshal_VOID__VOID,
+                   _gtk_marshal_VOID__VOID,
                    GTK_TYPE_NONE, 0);
   list_signals[SELECT_CHILD] =
     gtk_signal_new ("select_child",
                    GTK_RUN_FIRST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkListClass, select_child),
-                   gtk_marshal_VOID__OBJECT,
+                   _gtk_marshal_VOID__OBJECT,
                    GTK_TYPE_NONE, 1,
                    GTK_TYPE_WIDGET);
   list_signals[UNSELECT_CHILD] =
@@ -259,7 +260,7 @@ gtk_list_class_init (GtkListClass *class)
                    GTK_RUN_FIRST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkListClass, unselect_child),
-                   gtk_marshal_VOID__OBJECT,
+                   _gtk_marshal_VOID__OBJECT,
                    GTK_TYPE_NONE, 1,
                    GTK_TYPE_WIDGET);
   
index 504f63ca30f56b0ace36c3bd80ec0ad187384cac..d6f7a1d40bdd1aa05e6abf3744182c980e4b6094 100644 (file)
@@ -28,6 +28,7 @@
 #include "gtklabel.h"
 #include "gtklistitem.h"
 #include "gtklist.h"
+#include "gtkmarshalers.h"
 #include "gtksignal.h"
 #include <gdk/gdkkeysyms.h>
 
@@ -135,56 +136,56 @@ gtk_list_item_class_init (GtkListItemClass *class)
                     GTK_RUN_LAST | GTK_RUN_ACTION,
                     GTK_CLASS_TYPE (object_class),
                     GTK_SIGNAL_OFFSET (GtkListItemClass, toggle_focus_row),
-                    gtk_marshal_VOID__VOID,
+                    _gtk_marshal_VOID__VOID,
                     GTK_TYPE_NONE, 0);
   list_item_signals[SELECT_ALL] =
     gtk_signal_new ("select_all",
                     GTK_RUN_LAST | GTK_RUN_ACTION,
                     GTK_CLASS_TYPE (object_class),
                     GTK_SIGNAL_OFFSET (GtkListItemClass, select_all),
-                    gtk_marshal_VOID__VOID,
+                    _gtk_marshal_VOID__VOID,
                     GTK_TYPE_NONE, 0);
   list_item_signals[UNSELECT_ALL] =
     gtk_signal_new ("unselect_all",
                     GTK_RUN_LAST | GTK_RUN_ACTION,
                     GTK_CLASS_TYPE (object_class),
                     GTK_SIGNAL_OFFSET (GtkListItemClass, unselect_all),
-                    gtk_marshal_VOID__VOID,
+                    _gtk_marshal_VOID__VOID,
                     GTK_TYPE_NONE, 0);
   list_item_signals[UNDO_SELECTION] =
     gtk_signal_new ("undo_selection",
                    GTK_RUN_LAST | GTK_RUN_ACTION,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkListItemClass, undo_selection),
-                   gtk_marshal_VOID__VOID,
+                   _gtk_marshal_VOID__VOID,
                    GTK_TYPE_NONE, 0);
   list_item_signals[START_SELECTION] =
     gtk_signal_new ("start_selection",
                    GTK_RUN_LAST | GTK_RUN_ACTION,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkListItemClass, start_selection),
-                   gtk_marshal_VOID__VOID,
+                   _gtk_marshal_VOID__VOID,
                    GTK_TYPE_NONE, 0);
   list_item_signals[END_SELECTION] =
     gtk_signal_new ("end_selection",
                    GTK_RUN_LAST | GTK_RUN_ACTION,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkListItemClass, end_selection),
-                   gtk_marshal_VOID__VOID,
+                   _gtk_marshal_VOID__VOID,
                    GTK_TYPE_NONE, 0);
   list_item_signals[TOGGLE_ADD_MODE] =
     gtk_signal_new ("toggle_add_mode",
                    GTK_RUN_LAST | GTK_RUN_ACTION,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkListItemClass, toggle_add_mode),
-                   gtk_marshal_VOID__VOID,
+                   _gtk_marshal_VOID__VOID,
                    GTK_TYPE_NONE, 0);
   list_item_signals[EXTEND_SELECTION] =
     gtk_signal_new ("extend_selection",
                     GTK_RUN_LAST | GTK_RUN_ACTION,
                     GTK_CLASS_TYPE (object_class),
                     GTK_SIGNAL_OFFSET (GtkListItemClass, extend_selection),
-                    gtk_marshal_VOID__ENUM_FLOAT_BOOL,
+                    _gtk_marshal_VOID__ENUM_FLOAT_BOOLEAN,
                     GTK_TYPE_NONE, 3,
                    GTK_TYPE_SCROLL_TYPE, GTK_TYPE_FLOAT, GTK_TYPE_BOOL);
   list_item_signals[SCROLL_VERTICAL] =
@@ -192,14 +193,14 @@ gtk_list_item_class_init (GtkListItemClass *class)
                     GTK_RUN_LAST | GTK_RUN_ACTION,
                     GTK_CLASS_TYPE (object_class),
                     GTK_SIGNAL_OFFSET (GtkListItemClass, scroll_vertical),
-                    gtk_marshal_VOID__ENUM_FLOAT,
+                    _gtk_marshal_VOID__ENUM_FLOAT,
                     GTK_TYPE_NONE, 2, GTK_TYPE_SCROLL_TYPE, GTK_TYPE_FLOAT);
   list_item_signals[SCROLL_HORIZONTAL] =
     gtk_signal_new ("scroll_horizontal",
                     GTK_RUN_LAST | GTK_RUN_ACTION,
                     GTK_CLASS_TYPE (object_class),
                     GTK_SIGNAL_OFFSET (GtkListItemClass, scroll_horizontal),
-                    gtk_marshal_VOID__ENUM_FLOAT,
+                    _gtk_marshal_VOID__ENUM_FLOAT,
                     GTK_TYPE_NONE, 2, GTK_TYPE_SCROLL_TYPE, GTK_TYPE_FLOAT);
 
   binding_set = gtk_binding_set_by_class (class);
index 0cd270728c86991d5611546cdc125dc806281c4c..a016dffc6d8a38d11877384bd68c276b4a53c8ef 100644 (file)
@@ -1,87 +1,36 @@
-# see glib-genmarshal(1) for a detailed description of the file format,
-# possible parameter types are:
-#   VOID        indicates   no   return   type,  or  no  extra
-#               parameters. if VOID is used as  the  parameter
-#               list, no additional parameters may be present.
-#   BOOLEAN     for boolean types (gboolean)
-#   CHAR        for signed char types (gchar)
-#   UCHAR       for unsigned char types (guchar)
-#   INT         for signed integer types (gint)
-#   UINT        for unsigned integer types (guint)
-#   LONG        for signed long integer types (glong)
-#   ULONG       for unsigned long integer types (gulong)
-#   ENUM        for enumeration types (gint)
-#   FLAGS       for flag enumeration types (guint)
-#   FLOAT       for single-precision float types (gfloat)
-#   DOUBLE      for double-precision float types (gdouble)
-#   STRING      for string types (gchar*)
-#   BOXED       for boxed (anonymous but reference counted) types (GBoxed*)
-#   POINTER     for anonymous pointer types (gpointer)
-#   OBJECT      for GObject or derived types (GObject*)
-#   NONE        deprecated alias for VOID
-#   BOOL        deprecated alias for BOOLEAN
-
-BOOLEAN:BOXED
-BOOLEAN:BOXED,BOXED
-BOOLEAN:ENUM
-BOOLEAN:OBJECT,UINT,UINT
-BOOLEAN:OBJECT,INT,INT,UINT
-BOOLEAN:OBJECT,STRING,STRING,BOXED
-BOOLEAN:OBJECT,BOXED,BOXED
-BOOLEAN:INT,INT
-BOOLEAN:VOID
-BOOLEAN:BOOLEAN
+BOOL:NONE
+BOOL:POINTER
+BOOL:POINTER,POINTER,INT,INT
+BOOL:POINTER,INT,INT
+BOOL:POINTER,INT,INT,UINT
+BOOL:POINTER,STRING,STRING,POINTER
 ENUM:ENUM
 INT:POINTER
+INT:POINTER,CHAR,CHAR
 NONE:BOOL
+NONE:BOXED
 NONE:ENUM
+NONE:ENUM,FLOAT
+NONE:ENUM,FLOAT,BOOL
 NONE:INT
 NONE:INT,INT
+NONE:INT,INT,POINTER
 NONE:NONE
+NONE:OBJECT
 NONE:POINTER
+NONE:POINTER,INT
+NONE:POINTER,POINTER
+NONE:POINTER,POINTER,POINTER
+NONE:POINTER,STRING,STRING
+NONE:POINTER,UINT
+NONE:POINTER,UINT,ENUM
+NONE:POINTER,POINTER,UINT,UINT
+NONE:POINTER,INT,INT,POINTER,UINT,UINT
+NONE:POINTER,UINT,UINT
+NONE:POINTER,UINT,UINT
+NONE:STRING
 NONE:STRING,INT,POINTER
-STRING:DOUBLE
-VOID:BOOLEAN
-VOID:BOOLEAN,BOOLEAN,BOOLEAN
-VOID:BOXED
-VOID:BOXED,BOXED
-VOID:BOXED,BOXED,POINTER
-VOID:BOXED,POINTER
-VOID:BOXED,OBJECT
-VOID:BOXED,STRING,INT
-VOID:BOXED,UINT
-VOID:BOXED,UINT,FLAGS
-VOID:BOXED,UINT,UINT
-VOID:ENUM
-VOID:ENUM,ENUM
-VOID:ENUM,FLOAT
-VOID:ENUM,FLOAT,BOOL
-VOID:ENUM,INT
-VOID:ENUM,INT,BOOLEAN
-VOID:INT
-VOID:INT,INT
-VOID:INT,INT,BOXED
-VOID:INT,INT,INT
-VOID:OBJECT
-VOID:OBJECT,BOOLEAN
-VOID:OBJECT,BOXED,BOXED
-VOID:OBJECT,BOXED,UINT,UINT
-VOID:OBJECT,INT,INT
-VOID:OBJECT,INT,INT,BOXED,UINT,UINT
-VOID:OBJECT,OBJECT
-VOID:OBJECT,STRING,STRING
-VOID:OBJECT,UINT
-VOID:OBJECT,UINT,FLAGS
-VOID:POINTER
-VOID:POINTER,INT
-VOID:POINTER,POINTER,POINTER
-VOID:POINTER,UINT
-VOID:STRING
-VOID:STRING,STRING
-VOID:STRING,INT,POINTER
-VOID:UINT,UINT
-VOID:UINT,UINT,BOXED
-VOID:UINT,STRING
-VOID:UINT,BOXED,UINT,FLAGS,FLAGS
-VOID:UINT,OBJECT,UINT,FLAGS,FLAGS
-VOID:VOID
+NONE:UINT
+NONE:UINT,POINTER,UINT,ENUM,ENUM,POINTER
+NONE:UINT,POINTER,UINT,UINT,ENUM
+NONE:UINT,STRING
index 0cd270728c86991d5611546cdc125dc806281c4c..5b1478accd6c0b5acc18fa931973f2a7b71a9a4b 100644 (file)
@@ -33,7 +33,7 @@ BOOLEAN:VOID
 BOOLEAN:BOOLEAN
 ENUM:ENUM
 INT:POINTER
-NONE:BOOL
+NONE:BOOLEAN
 NONE:ENUM
 NONE:INT
 NONE:INT,INT
@@ -55,7 +55,7 @@ VOID:BOXED,UINT,UINT
 VOID:ENUM
 VOID:ENUM,ENUM
 VOID:ENUM,FLOAT
-VOID:ENUM,FLOAT,BOOL
+VOID:ENUM,FLOAT,BOOLEAN
 VOID:ENUM,INT
 VOID:ENUM,INT,BOOLEAN
 VOID:INT
index d962806fd07e25a19d66ff60d17e2c38b1ccda3d..d965f9b1604ca837e17e663760d882309af0828a 100644 (file)
@@ -27,6 +27,7 @@
 #include <string.h>
 #include "gtkaccellabel.h"
 #include "gtkmain.h"
+#include "gtkmarshalers.h"
 #include "gtkmenu.h"
 #include "gtkmenubar.h"
 #include "gtkmenuitem.h"
@@ -166,7 +167,7 @@ gtk_menu_item_class_init (GtkMenuItemClass *klass)
                     GTK_RUN_FIRST | GTK_RUN_ACTION,
                     GTK_CLASS_TYPE (object_class),
                     GTK_SIGNAL_OFFSET (GtkMenuItemClass, activate),
-                    gtk_marshal_VOID__VOID,
+                    _gtk_marshal_VOID__VOID,
                    GTK_TYPE_NONE, 0);
   widget_class->activate_signal = menu_item_signals[ACTIVATE];
 
@@ -183,7 +184,7 @@ gtk_menu_item_class_init (GtkMenuItemClass *klass)
                     GTK_RUN_FIRST,
                     GTK_CLASS_TYPE (object_class),
                     GTK_SIGNAL_OFFSET (GtkMenuItemClass, toggle_size_request),
-                    gtk_marshal_NONE__POINTER,
+                    _gtk_marshal_NONE__POINTER,
                    GTK_TYPE_NONE, 1,
                    GTK_TYPE_POINTER);
 
@@ -192,7 +193,7 @@ gtk_menu_item_class_init (GtkMenuItemClass *klass)
                     GTK_RUN_FIRST,
                     GTK_CLASS_TYPE (object_class),
                     GTK_SIGNAL_OFFSET (GtkMenuItemClass, toggle_size_allocate),
-                    gtk_marshal_NONE__INT,
+                    _gtk_marshal_NONE__INT,
                    GTK_TYPE_NONE, 1,
                    GTK_TYPE_INT);
 }
index ffc1499b8275ace9ea05885c335ad1c20fd257ff..65626e0018097d1e9ac7cf91fe9fa145bc5db92c 100644 (file)
@@ -27,6 +27,7 @@
 #include "gdk/gdkkeysyms.h"
 #include "gtkbindings.h"
 #include "gtkmain.h"
+#include "gtkmarshalers.h"
 #include "gtkmenuitem.h"
 #include "gtktearoffmenuitem.h" /* FIXME */
 #include "gtkmenushell.h"
@@ -217,21 +218,21 @@ gtk_menu_shell_class_init (GtkMenuShellClass *klass)
                     GTK_RUN_FIRST,
                     GTK_CLASS_TYPE (object_class),
                     GTK_SIGNAL_OFFSET (GtkMenuShellClass, deactivate),
-                    gtk_marshal_VOID__VOID,
+                    _gtk_marshal_VOID__VOID,
                    GTK_TYPE_NONE, 0);
   menu_shell_signals[SELECTION_DONE] =
     gtk_signal_new ("selection-done",
                     GTK_RUN_FIRST,
                     GTK_CLASS_TYPE (object_class),
                     GTK_SIGNAL_OFFSET (GtkMenuShellClass, selection_done),
-                    gtk_marshal_VOID__VOID,
+                    _gtk_marshal_VOID__VOID,
                    GTK_TYPE_NONE, 0);
   menu_shell_signals[MOVE_CURRENT] =
     gtk_signal_new ("move_current",
                    GTK_RUN_LAST | GTK_RUN_ACTION,
                    GTK_CLASS_TYPE (object_class),
                     GTK_SIGNAL_OFFSET (GtkMenuShellClass, move_current),
-                   gtk_marshal_VOID__ENUM,
+                   _gtk_marshal_VOID__ENUM,
                    GTK_TYPE_NONE, 1, 
                    GTK_TYPE_MENU_DIRECTION_TYPE);
   menu_shell_signals[ACTIVATE_CURRENT] =
@@ -239,7 +240,7 @@ gtk_menu_shell_class_init (GtkMenuShellClass *klass)
                    GTK_RUN_LAST | GTK_RUN_ACTION,
                    GTK_CLASS_TYPE (object_class),
                     GTK_SIGNAL_OFFSET (GtkMenuShellClass, activate_current),
-                   gtk_marshal_VOID__BOOLEAN,
+                   _gtk_marshal_VOID__BOOLEAN,
                    GTK_TYPE_NONE, 1, 
                    GTK_TYPE_BOOL);
   menu_shell_signals[CANCEL] =
@@ -247,7 +248,7 @@ gtk_menu_shell_class_init (GtkMenuShellClass *klass)
                    GTK_RUN_LAST | GTK_RUN_ACTION,
                    GTK_CLASS_TYPE (object_class),
                     GTK_SIGNAL_OFFSET (GtkMenuShellClass, cancel),
-                    gtk_marshal_VOID__VOID,
+                    _gtk_marshal_VOID__VOID,
                    GTK_TYPE_NONE, 0);
 
   binding_set = gtk_binding_set_by_class (klass);
index ee96b4ae093be8cf2741b5c18131380507c81395..2c97fff6b80f6647f7b099a4774e8f075ce7a6c1 100644 (file)
@@ -33,6 +33,7 @@
 #include <gdk/gdkkeysyms.h>
 #include <stdio.h>
 #include "gtkintl.h"
+#include "gtkmarshalers.h"
 #include "gtkbindings.h"
 
 
@@ -437,7 +438,7 @@ gtk_notebook_class_init (GtkNotebookClass *class)
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkNotebookClass, switch_page),
-                   gtk_marshal_VOID__POINTER_UINT,
+                   _gtk_marshal_VOID__POINTER_UINT,
                    GTK_TYPE_NONE, 2,
                    GTK_TYPE_POINTER,
                    GTK_TYPE_UINT);
@@ -447,7 +448,7 @@ gtk_notebook_class_init (GtkNotebookClass *class)
                   G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
                   G_STRUCT_OFFSET (GtkNotebookClass, focus_tab),
                   NULL, NULL,
-                  gtk_marshal_VOID__ENUM,
+                  _gtk_marshal_VOID__ENUM,
                   G_TYPE_NONE, 1,
                   GTK_TYPE_NOTEBOOK_TAB);
   notebook_signals[SELECT_PAGE] = 
@@ -456,7 +457,7 @@ gtk_notebook_class_init (GtkNotebookClass *class)
                   G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
                   G_STRUCT_OFFSET (GtkNotebookClass, select_page),
                   NULL, NULL,
-                  gtk_marshal_VOID__BOOLEAN,
+                  _gtk_marshal_VOID__BOOLEAN,
                   G_TYPE_NONE, 1,
                   G_TYPE_BOOLEAN);
   notebook_signals[CHANGE_CURRENT_PAGE] = 
index 1f45383bee23677add482d52ad17612fb72f1f61..483a00e95cc52a270202e57c4ecfa7e059e970fc 100644 (file)
@@ -28,6 +28,7 @@
 #include <string.h>
 #include <stdio.h>
 #include "gtkobject.h"
+#include "gtkmarshalers.h"
 #include "gtksignal.h"
 
 
@@ -332,7 +333,7 @@ gtk_object_class_init (GtkObjectClass *class)
                     G_SIGNAL_RUN_CLEANUP | G_SIGNAL_NO_RECURSE | GTK_RUN_NO_HOOKS,
                     GTK_CLASS_TYPE (class),
                     GTK_SIGNAL_OFFSET (GtkObjectClass, destroy),
-                    gtk_marshal_VOID__VOID,
+                    _gtk_marshal_VOID__VOID,
                    GTK_TYPE_NONE, 0);
 }
 
index caca8890c1df06ccdb6341ab7948d5b45be6f0c9..5ec2eeb09fea0da1ff3b03aec8cee12e08495a5d 100644 (file)
@@ -31,6 +31,7 @@
 #include "gtkclipboard.h"
 #include "gtkoldeditable.h"
 #include "gtkmain.h"
+#include "gtkmarshalers.h"
 #include "gtkselection.h"
 #include "gtksignal.h"
 
@@ -206,7 +207,7 @@ gtk_old_editable_class_init (GtkOldEditableClass *class)
                    GTK_RUN_LAST | GTK_RUN_ACTION,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkOldEditableClass, activate),
-                   gtk_marshal_NONE__NONE,
+                   _gtk_marshal_NONE__NONE,
                    GTK_TYPE_NONE, 0);
   widget_class->activate_signal = editable_signals[ACTIVATE];
 
@@ -215,7 +216,7 @@ gtk_old_editable_class_init (GtkOldEditableClass *class)
                    GTK_RUN_LAST | GTK_RUN_ACTION,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkOldEditableClass, set_editable),
-                   gtk_marshal_NONE__BOOL,
+                   _gtk_marshal_NONE__BOOLEAN,
                    GTK_TYPE_NONE, 1,
                    GTK_TYPE_BOOL);
 
@@ -224,7 +225,7 @@ gtk_old_editable_class_init (GtkOldEditableClass *class)
                    GTK_RUN_LAST | GTK_RUN_ACTION,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkOldEditableClass, move_cursor),
-                   gtk_marshal_NONE__INT_INT,
+                   _gtk_marshal_NONE__INT_INT,
                    GTK_TYPE_NONE, 2, 
                    GTK_TYPE_INT, 
                    GTK_TYPE_INT);
@@ -234,7 +235,7 @@ gtk_old_editable_class_init (GtkOldEditableClass *class)
                    GTK_RUN_LAST | GTK_RUN_ACTION,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkOldEditableClass, move_word),
-                   gtk_marshal_NONE__INT,
+                   _gtk_marshal_NONE__INT,
                    GTK_TYPE_NONE, 1, 
                    GTK_TYPE_INT);
 
@@ -243,7 +244,7 @@ gtk_old_editable_class_init (GtkOldEditableClass *class)
                    GTK_RUN_LAST | GTK_RUN_ACTION,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkOldEditableClass, move_page),
-                   gtk_marshal_NONE__INT_INT,
+                   _gtk_marshal_NONE__INT_INT,
                    GTK_TYPE_NONE, 2, 
                    GTK_TYPE_INT, 
                    GTK_TYPE_INT);
@@ -253,7 +254,7 @@ gtk_old_editable_class_init (GtkOldEditableClass *class)
                    GTK_RUN_LAST | GTK_RUN_ACTION,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkOldEditableClass, move_to_row),
-                   gtk_marshal_NONE__INT,
+                   _gtk_marshal_NONE__INT,
                    GTK_TYPE_NONE, 1, 
                    GTK_TYPE_INT);
 
@@ -262,7 +263,7 @@ gtk_old_editable_class_init (GtkOldEditableClass *class)
                    GTK_RUN_LAST | GTK_RUN_ACTION,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkOldEditableClass, move_to_column),
-                   gtk_marshal_NONE__INT,
+                   _gtk_marshal_NONE__INT,
                    GTK_TYPE_NONE, 1, 
                    GTK_TYPE_INT);
 
@@ -271,7 +272,7 @@ gtk_old_editable_class_init (GtkOldEditableClass *class)
                    GTK_RUN_LAST | GTK_RUN_ACTION,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkOldEditableClass, kill_char),
-                   gtk_marshal_NONE__INT,
+                   _gtk_marshal_NONE__INT,
                    GTK_TYPE_NONE, 1, 
                    GTK_TYPE_INT);
 
@@ -280,7 +281,7 @@ gtk_old_editable_class_init (GtkOldEditableClass *class)
                    GTK_RUN_LAST | GTK_RUN_ACTION,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkOldEditableClass, kill_word),
-                   gtk_marshal_NONE__INT,
+                   _gtk_marshal_NONE__INT,
                    GTK_TYPE_NONE, 1, 
                    GTK_TYPE_INT);
 
@@ -289,7 +290,7 @@ gtk_old_editable_class_init (GtkOldEditableClass *class)
                    GTK_RUN_LAST | GTK_RUN_ACTION,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkOldEditableClass, kill_line),
-                   gtk_marshal_NONE__INT,
+                   _gtk_marshal_NONE__INT,
                    GTK_TYPE_NONE, 1, 
                    GTK_TYPE_INT);
 
@@ -298,7 +299,7 @@ gtk_old_editable_class_init (GtkOldEditableClass *class)
                    GTK_RUN_LAST | GTK_RUN_ACTION,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkOldEditableClass, cut_clipboard),
-                   gtk_marshal_NONE__NONE,
+                   _gtk_marshal_NONE__NONE,
                    GTK_TYPE_NONE, 0);
 
   editable_signals[COPY_CLIPBOARD] =
@@ -306,7 +307,7 @@ gtk_old_editable_class_init (GtkOldEditableClass *class)
                    GTK_RUN_LAST | GTK_RUN_ACTION,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkOldEditableClass, copy_clipboard),
-                   gtk_marshal_NONE__NONE,
+                   _gtk_marshal_NONE__NONE,
                    GTK_TYPE_NONE, 0);
 
   editable_signals[PASTE_CLIPBOARD] =
@@ -314,7 +315,7 @@ gtk_old_editable_class_init (GtkOldEditableClass *class)
                    GTK_RUN_LAST | GTK_RUN_ACTION,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkOldEditableClass, paste_clipboard),
-                   gtk_marshal_NONE__NONE,
+                   _gtk_marshal_NONE__NONE,
                    GTK_TYPE_NONE, 0);
 
   gtk_object_add_arg_type ("GtkOldEditable::text_position", GTK_TYPE_INT, GTK_ARG_READWRITE, ARG_TEXT_POSITION);
index 830960eef850268a8e01eaaff7eb21333dfec6a8..8e7856ce7057ddbc8401c51eedffb1d3d05a58d1 100644 (file)
@@ -28,6 +28,7 @@
 #include "gtkmenu.h"
 #include "gtkmenuitem.h"
 #include "gtkoptionmenu.h"
+#include "gtkmarshalers.h"
 #include "gtksignal.h"
 #include "gdk/gdkkeysyms.h"
 
@@ -158,7 +159,7 @@ gtk_option_menu_class_init (GtkOptionMenuClass *class)
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GtkOptionMenuClass, changed),
                   NULL, NULL,
-                  gtk_marshal_VOID__VOID,
+                  _gtk_marshal_VOID__VOID,
                   G_TYPE_NONE, 0);
 
   gobject_class->set_property = gtk_option_menu_set_property;
index c590e752eb94de79d39bd00b591924eb21cdd406..f937fa4569a7c67fde00f7a2c4c6ea16beaf7eb6 100644 (file)
@@ -26,7 +26,7 @@
  */
 
 #include "gtkmain.h"
-#include "gtkmarshal.h"
+#include "gtkmarshalers.h"
 #include "gtkplug.h"
 #include "gtkprivate.h"
 
@@ -148,7 +148,7 @@ gtk_plug_class_init (GtkPlugClass *class)
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkPlugClass, embedded),
                  NULL, NULL,
-                 gtk_marshal_VOID__VOID,
+                 _gtk_marshal_VOID__VOID,
                  GTK_TYPE_NONE, 0);
 }
 
index 7678159517f50b820ca6647b698dd52d387f8ca3..2f51e174c8a9990faf52c125fe4a6ec60ac61526 100644 (file)
@@ -28,6 +28,7 @@
 #include <stdio.h>
 #include "gtkintl.h"
 #include "gtkmain.h"
+#include "gtkmarshalers.h"
 #include "gtkrange.h"
 #include "gtksignal.h"
 #include "gtkintl.h"
@@ -240,7 +241,7 @@ gtk_range_class_init (GtkRangeClass *class)
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GtkRangeClass, value_changed),
                   NULL, NULL,
-                  gtk_marshal_NONE__NONE,
+                  _gtk_marshal_NONE__NONE,
                   G_TYPE_NONE, 0);
   
   signals[MOVE_SLIDER] =
@@ -249,7 +250,7 @@ gtk_range_class_init (GtkRangeClass *class)
                   G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
                   G_STRUCT_OFFSET (GtkRangeClass, move_slider),
                   NULL, NULL,
-                  gtk_marshal_VOID__ENUM,
+                  _gtk_marshal_VOID__ENUM,
                   G_TYPE_NONE, 1,
                   GTK_TYPE_SCROLL_TYPE);
   
index 79be496bed35381769e782f603ae415ef87798e9..c03aa14105e62a791a6b4ed7a80d16e4af7539f1 100644 (file)
@@ -28,7 +28,7 @@
 #include <math.h>
 #include "gtkintl.h"
 #include "gtkscale.h"
-#include "gtkmarshal.h"
+#include "gtkmarshalers.h"
 #include "gdk/gdkkeysyms.h"
 #include "gtkbindings.h"
 
@@ -138,7 +138,7 @@ gtk_scale_class_init (GtkScaleClass *class)
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GtkScaleClass, format_value),
                   single_string_accumulator, NULL,
-                  gtk_marshal_STRING__DOUBLE,
+                  _gtk_marshal_STRING__DOUBLE,
                   G_TYPE_STRING, 1,
                   G_TYPE_DOUBLE);
 
index 10f2328ef3766783a3064fd7db67a4ebdc08760c..0729a064ea847e270021c1cc9797967bd564b187 100644 (file)
@@ -18,8 +18,6 @@
  */
 
 #include       "gtksignal.h"
-#include       "gtkmarshal.c"
-
 
 /* the real parameter limit is of course given by GSignal, bu we need
  * an upper limit for the implementations. so this should be adjusted
index a24b067f9af93eca9728c6a57c7d6c67cb05aa8d..a9c2e34a235d5e8c6855c326211fb1cc957d9ff2 100644 (file)
 #include <gtk/gtkobject.h>
 #include <gtk/gtkmarshal.h>
 
-
 G_BEGIN_DECLS
   
 #ifndef GTK_DISABLE_DEPRECATED
 
-#define        gtk_signal_default_marshaller   gtk_marshal_VOID__VOID
+#define        gtk_signal_default_marshaller   g_cclosure_marshal_VOID__VOID
 
 
 /* --- compat defines --- */
index a617467e688c054ff329ed3900e4380abd12fbad..c7c8f813505cfb1eddce216d3bbdb94198894ce5 100644 (file)
@@ -27,7 +27,7 @@
 
 #include "gdk/gdkkeysyms.h"
 #include "gtkmain.h"
-#include "gtkmarshal.h"
+#include "gtkmarshalers.h"
 #include "gtkwindow.h"
 #include "gtkplug.h"
 #include "gtkprivate.h"
@@ -160,7 +160,7 @@ gtk_socket_class_init (GtkSocketClass *class)
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkSocketClass, plug_added),
                  NULL, NULL,
-                 gtk_marshal_VOID__VOID,
+                 _gtk_marshal_VOID__VOID,
                  GTK_TYPE_NONE, 0);
   socket_signals[PLUG_REMOVED] =
     g_signal_new ("plug_removed",
@@ -168,7 +168,7 @@ gtk_socket_class_init (GtkSocketClass *class)
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkSocketClass, plug_removed),
                   _gtk_boolean_handled_accumulator, NULL,
-                 gtk_marshal_BOOLEAN__VOID,
+                 _gtk_marshal_BOOLEAN__VOID,
                  G_TYPE_BOOLEAN, 0);
 }
 
index c0a2cb0406353d76f59b83f50825cdbab4fede5c..172120234b70cc6d0fd793a0e046436ec619ff35 100644 (file)
@@ -35,6 +35,7 @@
 #include "gdk/gdkkeysyms.h"
 #include "gtkspinbutton.h"
 #include "gtkmain.h"
+#include "gtkmarshalers.h"
 #include "gtksignal.h"
 #include "gtksettings.h"
 #include "gtkintl.h"
@@ -289,7 +290,7 @@ gtk_spin_button_class_init (GtkSpinButtonClass *class)
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkSpinButtonClass, input),
-                   gtk_marshal_INT__POINTER,
+                   _gtk_marshal_INT__POINTER,
                    GTK_TYPE_INT, 1, GTK_TYPE_POINTER);
 
   spinbutton_signals[OUTPUT] =
@@ -298,7 +299,7 @@ gtk_spin_button_class_init (GtkSpinButtonClass *class)
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET(GtkSpinButtonClass, output),
                   _gtk_boolean_handled_accumulator, NULL,
-                  gtk_marshal_BOOLEAN__VOID,
+                  _gtk_marshal_BOOLEAN__VOID,
                   G_TYPE_BOOLEAN, 0);
 
   spinbutton_signals[VALUE_CHANGED] =
@@ -306,7 +307,7 @@ gtk_spin_button_class_init (GtkSpinButtonClass *class)
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkSpinButtonClass, value_changed),
-                   gtk_marshal_VOID__VOID,
+                   _gtk_marshal_VOID__VOID,
                    GTK_TYPE_NONE, 0);
 }
 
index d62cf76e26823ad80a1751c0bee1730ca9fb9e5b..e77503ed466dca2ff3062d24e57d91ac1cb92f9d 100644 (file)
@@ -27,6 +27,7 @@
 
 #include "gtkframe.h"
 #include "gtklabel.h"
+#include "gtkmarshalers.h"
 #include "gtksignal.h"
 #include "gtkstatusbar.h"
 #include "gtkwindow.h"
@@ -138,7 +139,7 @@ gtk_statusbar_class_init (GtkStatusbarClass *class)
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkStatusbarClass, text_pushed),
-                   gtk_marshal_VOID__UINT_STRING,
+                   _gtk_marshal_VOID__UINT_STRING,
                    GTK_TYPE_NONE, 2,
                    GTK_TYPE_UINT,
                    GTK_TYPE_STRING);
@@ -147,7 +148,7 @@ gtk_statusbar_class_init (GtkStatusbarClass *class)
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkStatusbarClass, text_popped),
-                   gtk_marshal_VOID__UINT_STRING,
+                   _gtk_marshal_VOID__UINT_STRING,
                    GTK_TYPE_NONE, 2,
                    GTK_TYPE_UINT,
                    GTK_TYPE_STRING);
index ca0e86f9db4adf218223708216bb8d82aabb1ae7..4e5c551dd6599e583781e2e83bcdbd5f31ce0fec 100644 (file)
@@ -29,6 +29,7 @@
 #include "gdk/gdkkeysyms.h"
 #include "gdk/gdki18n.h"
 #include "gtkmain.h"
+#include "gtkmarshalers.h"
 #include "gtkselection.h"
 #include "gtksignal.h"
 #define GTK_ENABLE_BROKEN
@@ -634,7 +635,7 @@ gtk_text_class_init (GtkTextClass *class)
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkTextClass, set_scroll_adjustments),
-                   gtk_marshal_VOID__OBJECT_OBJECT,
+                   _gtk_marshal_VOID__OBJECT_OBJECT,
                    GTK_TYPE_NONE, 2, GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT);
 }
 
index 30410be5f45097b3c36499c0b3d3331ff960f678..1be7f0ec33b4384b5abaf2fa96259c5498cfed5d 100644 (file)
@@ -31,6 +31,7 @@
 #define GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
 #include "gtkclipboard.h"
 #include "gtkinvisible.h"
+#include "gtkmarshalers.h"
 #include "gtksignal.h"
 #include "gtktextbuffer.h"
 #include "gtktextbtree.h"
@@ -167,7 +168,7 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass)
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GtkTextBufferClass, insert_text),
                   NULL, NULL,
-                  gtk_marshal_VOID__BOXED_STRING_INT,
+                  _gtk_marshal_VOID__BOXED_STRING_INT,
                   GTK_TYPE_NONE,
                   3,
                   GTK_TYPE_TEXT_ITER | G_SIGNAL_TYPE_STATIC_SCOPE,
@@ -180,7 +181,7 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass)
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GtkTextBufferClass, insert_pixbuf),
                   NULL, NULL,
-                  gtk_marshal_VOID__BOXED_OBJECT,
+                  _gtk_marshal_VOID__BOXED_OBJECT,
                   GTK_TYPE_NONE,
                   2,
                   GTK_TYPE_TEXT_ITER | G_SIGNAL_TYPE_STATIC_SCOPE,
@@ -192,7 +193,7 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass)
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GtkTextBufferClass, insert_child_anchor),
                   NULL, NULL,
-                  gtk_marshal_VOID__BOXED_OBJECT,
+                  _gtk_marshal_VOID__BOXED_OBJECT,
                   GTK_TYPE_NONE,
                   2,
                   GTK_TYPE_TEXT_ITER | G_SIGNAL_TYPE_STATIC_SCOPE,
@@ -204,7 +205,7 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass)
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GtkTextBufferClass, delete_range),
                   NULL, NULL,
-                  gtk_marshal_VOID__BOXED_BOXED,
+                  _gtk_marshal_VOID__BOXED_BOXED,
                   GTK_TYPE_NONE,
                   2,
                   GTK_TYPE_TEXT_ITER | G_SIGNAL_TYPE_STATIC_SCOPE,
@@ -216,7 +217,7 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass)
                   G_SIGNAL_RUN_LAST,                   
                   G_STRUCT_OFFSET (GtkTextBufferClass, changed),
                   NULL, NULL,
-                  gtk_marshal_VOID__VOID,
+                  _gtk_marshal_VOID__VOID,
                   GTK_TYPE_NONE,
                   0);
 
@@ -226,7 +227,7 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass)
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GtkTextBufferClass, modified_changed),
                   NULL, NULL,
-                  gtk_marshal_VOID__VOID,
+                  _gtk_marshal_VOID__VOID,
                   GTK_TYPE_NONE,
                   0);
 
@@ -236,7 +237,7 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass)
                   G_SIGNAL_RUN_LAST,                   
                   G_STRUCT_OFFSET (GtkTextBufferClass, mark_set),
                   NULL, NULL,
-                  gtk_marshal_VOID__BOXED_OBJECT,
+                  _gtk_marshal_VOID__BOXED_OBJECT,
                   GTK_TYPE_NONE,
                   2,
                   GTK_TYPE_TEXT_ITER,
@@ -248,7 +249,7 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass)
                   G_SIGNAL_RUN_LAST,                   
                   G_STRUCT_OFFSET (GtkTextBufferClass, mark_deleted),
                   NULL, NULL,
-                  gtk_marshal_VOID__OBJECT,
+                  _gtk_marshal_VOID__OBJECT,
                   GTK_TYPE_NONE,
                   1,
                   GTK_TYPE_TEXT_MARK);
@@ -259,7 +260,7 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass)
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GtkTextBufferClass, apply_tag),
                   NULL, NULL,
-                  gtk_marshal_VOID__OBJECT_BOXED_BOXED,
+                  _gtk_marshal_VOID__OBJECT_BOXED_BOXED,
                   GTK_TYPE_NONE,
                   3,
                   GTK_TYPE_TEXT_TAG,
@@ -272,7 +273,7 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass)
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GtkTextBufferClass, remove_tag),
                   NULL, NULL,
-                  gtk_marshal_VOID__OBJECT_BOXED_BOXED,
+                  _gtk_marshal_VOID__OBJECT_BOXED_BOXED,
                   GTK_TYPE_NONE,
                   3,
                   GTK_TYPE_TEXT_TAG,
@@ -285,7 +286,7 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass)
                   G_SIGNAL_RUN_LAST,                   
                   G_STRUCT_OFFSET (GtkTextBufferClass, begin_user_action),
                   NULL, NULL,
-                  gtk_marshal_VOID__VOID,
+                  _gtk_marshal_VOID__VOID,
                   GTK_TYPE_NONE,
                   0);
 
@@ -295,7 +296,7 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass)
                   G_SIGNAL_RUN_LAST,                   
                   G_STRUCT_OFFSET (GtkTextBufferClass, end_user_action),
                   NULL, NULL,
-                  gtk_marshal_VOID__VOID,
+                  _gtk_marshal_VOID__VOID,
                   GTK_TYPE_NONE,
                   0);  
 }
index 67592dcebfd3ffb675a807f12f39949c213b68f6..a0e7575f69d93edc4f07ef7d4823efe7b6ac82c4 100644 (file)
@@ -78,6 +78,7 @@
 
 #define GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
 #include "gtksignal.h"
+#include "gtkmarshalers.h"
 #include "gtktextlayout.h"
 #include "gtktextbtree.h"
 #include "gtktextiterprivate.h"
@@ -179,7 +180,7 @@ gtk_text_layout_class_init (GtkTextLayoutClass *klass)
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GtkTextLayoutClass, invalidated),
                   NULL, NULL,
-                  gtk_marshal_VOID__VOID,
+                  _gtk_marshal_VOID__VOID,
                   GTK_TYPE_NONE,
                   0);
 
@@ -189,7 +190,7 @@ gtk_text_layout_class_init (GtkTextLayoutClass *klass)
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GtkTextLayoutClass, changed),
                   NULL, NULL,
-                  gtk_marshal_VOID__INT_INT_INT,
+                  _gtk_marshal_VOID__INT_INT_INT,
                   GTK_TYPE_NONE,
                   3,
                   GTK_TYPE_INT,
@@ -202,7 +203,7 @@ gtk_text_layout_class_init (GtkTextLayoutClass *klass)
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GtkTextLayoutClass, allocate_child),
                   NULL, NULL,
-                  gtk_marshal_VOID__OBJECT_INT_INT,
+                  _gtk_marshal_VOID__OBJECT_INT_INT,
                   GTK_TYPE_NONE,
                   3,
                   GTK_TYPE_OBJECT,
index 6bb028420a44dd146e76067faddd940868a52d1c..82fdc836f2be1449c68088a2b3c90e26bcc45e5b 100644 (file)
@@ -54,6 +54,7 @@
 #include "gtksignal.h"
 #include "gtkmain.h"
 #include "gtkintl.h"
+#include "gtkmarshalers.h"
 #include "gtktypebuiltins.h"
 
 #include <stdlib.h>
@@ -621,7 +622,7 @@ gtk_text_tag_class_init (GtkTextTagClass *klass)
                   G_SIGNAL_RUN_LAST,
                   GTK_SIGNAL_OFFSET (GtkTextTagClass, event),
                   _gtk_boolean_handled_accumulator, NULL,
-                  gtk_marshal_BOOLEAN__OBJECT_BOXED_BOXED,
+                  _gtk_marshal_BOOLEAN__OBJECT_BOXED_BOXED,
                   G_TYPE_BOOLEAN,
                   3,
                   G_TYPE_OBJECT,
index 0dee361103f4b755caa1ce3494ddb0137e5bd57a..7336e792fd9e17d8f4fa5aa8b0a9bde1c7f3eff2 100644 (file)
@@ -1,5 +1,6 @@
 
 #include "gtktexttagtable.h"
+#include "gtkmarshalers.h"
 #include "gtksignal.h"
 
 #include <stdlib.h>
@@ -77,7 +78,7 @@ gtk_text_tag_table_class_init (GtkTextTagTableClass *klass)
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GtkTextTagTableClass, tag_changed),
                   NULL, NULL,
-                  gtk_marshal_VOID__OBJECT_BOOLEAN,
+                  _gtk_marshal_VOID__OBJECT_BOOLEAN,
                   G_TYPE_NONE,
                   2,
                   GTK_TYPE_TEXT_TAG,
@@ -89,7 +90,7 @@ gtk_text_tag_table_class_init (GtkTextTagTableClass *klass)
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GtkTextTagTableClass, tag_added),
                   NULL, NULL,
-                  gtk_marshal_VOID__OBJECT,
+                  _gtk_marshal_VOID__OBJECT,
                   GTK_TYPE_NONE,
                   1,
                   GTK_TYPE_TEXT_TAG);
@@ -100,7 +101,7 @@ gtk_text_tag_table_class_init (GtkTextTagTableClass *klass)
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GtkTextTagTableClass, tag_removed),
                   NULL, NULL,
-                  gtk_marshal_VOID__OBJECT,
+                  _gtk_marshal_VOID__OBJECT,
                   GTK_TYPE_NONE,
                   1,
                   GTK_TYPE_TEXT_TAG);
index 8017a94cf3aaf526cc7ba0bb4ceda90eb0953889..ae03661bef556aebc5e5f0ee86c0f4fa8e271155 100644 (file)
@@ -32,6 +32,7 @@
 #include "gtkimagemenuitem.h"
 #include "gtkintl.h"
 #include "gtkmain.h"
+#include "gtkmarshalers.h"
 #include "gtkmenu.h"
 #include "gtkmenuitem.h"
 #include "gtkseparatormenuitem.h"
@@ -635,7 +636,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
                     GTK_RUN_LAST | GTK_RUN_ACTION,
                     GTK_CLASS_TYPE (object_class),
                     GTK_SIGNAL_OFFSET (GtkTextViewClass, move_cursor),
-                    gtk_marshal_VOID__ENUM_INT_BOOLEAN,
+                    _gtk_marshal_VOID__ENUM_INT_BOOLEAN,
                     GTK_TYPE_NONE, 3, GTK_TYPE_MOVEMENT_STEP, GTK_TYPE_INT, GTK_TYPE_BOOL);
 
   signals[SET_ANCHOR] =
@@ -643,7 +644,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
                     GTK_RUN_LAST | GTK_RUN_ACTION,
                     GTK_CLASS_TYPE (object_class),
                     GTK_SIGNAL_OFFSET (GtkTextViewClass, set_anchor),
-                    gtk_marshal_VOID__VOID,
+                    _gtk_marshal_VOID__VOID,
                     GTK_TYPE_NONE, 0);
 
   signals[INSERT_AT_CURSOR] =
@@ -651,7 +652,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
                     GTK_RUN_LAST | GTK_RUN_ACTION,
                     GTK_CLASS_TYPE (object_class),
                     GTK_SIGNAL_OFFSET (GtkTextViewClass, insert_at_cursor),
-                    gtk_marshal_VOID__STRING,
+                    _gtk_marshal_VOID__STRING,
                     GTK_TYPE_NONE, 1, GTK_TYPE_STRING);
 
   signals[DELETE_FROM_CURSOR] =
@@ -659,7 +660,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
                     GTK_RUN_LAST | GTK_RUN_ACTION,
                     GTK_CLASS_TYPE (object_class),
                     GTK_SIGNAL_OFFSET (GtkTextViewClass, delete_from_cursor),
-                    gtk_marshal_VOID__ENUM_INT,
+                    _gtk_marshal_VOID__ENUM_INT,
                     GTK_TYPE_NONE, 2, GTK_TYPE_DELETE_TYPE, GTK_TYPE_INT);
 
   signals[CUT_CLIPBOARD] =
@@ -667,7 +668,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
                     GTK_RUN_LAST | GTK_RUN_ACTION,
                     GTK_CLASS_TYPE (object_class),
                     GTK_SIGNAL_OFFSET (GtkTextViewClass, cut_clipboard),
-                    gtk_marshal_VOID__VOID,
+                    _gtk_marshal_VOID__VOID,
                     GTK_TYPE_NONE, 0);
 
   signals[COPY_CLIPBOARD] =
@@ -675,7 +676,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
                     GTK_RUN_LAST | GTK_RUN_ACTION,
                     GTK_CLASS_TYPE (object_class),
                     GTK_SIGNAL_OFFSET (GtkTextViewClass, copy_clipboard),
-                    gtk_marshal_VOID__VOID,
+                    _gtk_marshal_VOID__VOID,
                     GTK_TYPE_NONE, 0);
 
   signals[PASTE_CLIPBOARD] =
@@ -683,7 +684,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
                     GTK_RUN_LAST | GTK_RUN_ACTION,
                     GTK_CLASS_TYPE (object_class),
                     GTK_SIGNAL_OFFSET (GtkTextViewClass, paste_clipboard),
-                    gtk_marshal_VOID__VOID,
+                    _gtk_marshal_VOID__VOID,
                     GTK_TYPE_NONE, 0);
 
   signals[TOGGLE_OVERWRITE] =
@@ -691,7 +692,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
                     GTK_RUN_LAST | GTK_RUN_ACTION,
                     GTK_CLASS_TYPE (object_class),
                     GTK_SIGNAL_OFFSET (GtkTextViewClass, toggle_overwrite),
-                    gtk_marshal_VOID__VOID,
+                    _gtk_marshal_VOID__VOID,
                     GTK_TYPE_NONE, 0);
 
   signals[SET_SCROLL_ADJUSTMENTS] =
@@ -699,7 +700,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
                     GTK_RUN_LAST,
                     GTK_CLASS_TYPE (object_class),
                     GTK_SIGNAL_OFFSET (GtkTextViewClass, set_scroll_adjustments),
-                    gtk_marshal_VOID__OBJECT_OBJECT,
+                    _gtk_marshal_VOID__OBJECT_OBJECT,
                     GTK_TYPE_NONE, 2, GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT);
   widget_class->set_scroll_adjustments_signal = signals[SET_SCROLL_ADJUSTMENTS];
 
@@ -708,7 +709,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
                     GTK_RUN_LAST,
                     GTK_CLASS_TYPE (object_class),
                     GTK_SIGNAL_OFFSET (GtkTextViewClass, populate_popup),
-                    gtk_marshal_VOID__OBJECT,
+                    _gtk_marshal_VOID__OBJECT,
                     GTK_TYPE_NONE, 1, GTK_TYPE_MENU);
   
   /*
index ed16c1f7309396e0c36672e45eac9c18cd790493..c2ee0de0b07905a166860367878b0f3f6304e0c3 100644 (file)
@@ -31,6 +31,7 @@
 #include       "gtksignal.h"
 #include       "gtktooltips.h"
 #include       "gtkmain.h"
+#include        "gtkmarshalers.h"
 #include       "gtkintl.h"
 
 
@@ -139,21 +140,21 @@ gtk_tips_query_class_init (GtkTipsQueryClass *class)
                    GTK_RUN_FIRST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkTipsQueryClass, start_query),
-                   gtk_marshal_VOID__VOID,
+                   _gtk_marshal_VOID__VOID,
                    GTK_TYPE_NONE, 0);
   tips_query_signals[SIGNAL_STOP_QUERY] =
     gtk_signal_new ("stop_query",
                    GTK_RUN_FIRST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkTipsQueryClass, stop_query),
-                   gtk_marshal_VOID__VOID,
+                   _gtk_marshal_VOID__VOID,
                    GTK_TYPE_NONE, 0);
   tips_query_signals[SIGNAL_WIDGET_ENTERED] =
     gtk_signal_new ("widget_entered",
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkTipsQueryClass, widget_entered),
-                   gtk_marshal_VOID__OBJECT_STRING_STRING,
+                   _gtk_marshal_VOID__OBJECT_STRING_STRING,
                    GTK_TYPE_NONE, 3,
                    GTK_TYPE_WIDGET,
                    GTK_TYPE_STRING,
@@ -164,7 +165,7 @@ gtk_tips_query_class_init (GtkTipsQueryClass *class)
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET(GtkTipsQueryClass, widget_selected),
                   _gtk_boolean_handled_accumulator, NULL,
-                  gtk_marshal_BOOLEAN__OBJECT_STRING_STRING_BOXED,
+                  _gtk_marshal_BOOLEAN__OBJECT_STRING_STRING_BOXED,
                   G_TYPE_BOOLEAN, 4,
                   GTK_TYPE_WIDGET,
                   G_TYPE_STRING,
index dc3d8c90da795e7b07e16677d3d8533748f451e8..04d657e388eee9d50429d2a12dc6da5a86c5e641 100644 (file)
@@ -26,6 +26,7 @@
 
 #include "gtklabel.h"
 #include "gtkmain.h"
+#include "gtkmarshalers.h"
 #include "gtksignal.h"
 #include "gtktogglebutton.h"
 #include "gtkintl.h"
@@ -154,7 +155,7 @@ gtk_toggle_button_class_init (GtkToggleButtonClass *class)
                     GTK_RUN_FIRST,
                     GTK_CLASS_TYPE (object_class),
                     GTK_SIGNAL_OFFSET (GtkToggleButtonClass, toggled),
-                    gtk_marshal_VOID__VOID,
+                    _gtk_marshal_VOID__VOID,
                    GTK_TYPE_NONE, 0);
 }
 
index 65caaab22889eaf3ec4fd84a831c719951a86c89..7bf325e2d71e9df7352c7a63049acc6f720827d0 100644 (file)
@@ -37,6 +37,7 @@
 #include "gtkimage.h"
 #include "gtksettings.h"
 #include "gtkintl.h"
+#include "gtkmarshalers.h"
 
 
 #define DEFAULT_IPADDING 0
@@ -205,7 +206,7 @@ gtk_toolbar_class_init (GtkToolbarClass *class)
                    GTK_RUN_FIRST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkToolbarClass, orientation_changed),
-                   gtk_marshal_VOID__ENUM,
+                   _gtk_marshal_VOID__ENUM,
                    GTK_TYPE_NONE, 1,
                    GTK_TYPE_ORIENTATION);
   toolbar_signals[STYLE_CHANGED] =
@@ -213,7 +214,7 @@ gtk_toolbar_class_init (GtkToolbarClass *class)
                    GTK_RUN_FIRST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkToolbarClass, style_changed),
-                   gtk_marshal_VOID__ENUM,
+                   _gtk_marshal_VOID__ENUM,
                    GTK_TYPE_NONE, 1,
                    GTK_TYPE_TOOLBAR_STYLE);
   
index bc2c000b42da7b95e094762ec3da57c01072f523..dd96c880cd7744a2e9228dbedbc2f44cefbfbedd 100644 (file)
@@ -25,6 +25,7 @@
  */
 
 #include "gtkmain.h"
+#include "gtkmarshalers.h"
 #include "gtksignal.h"
 #include "gtklist.h"
 
@@ -140,14 +141,14 @@ gtk_tree_class_init (GtkTreeClass *class)
                    GTK_RUN_FIRST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkTreeClass, selection_changed),
-                   gtk_marshal_VOID__VOID,
+                   _gtk_marshal_VOID__VOID,
                    GTK_TYPE_NONE, 0);
   tree_signals[SELECT_CHILD] =
     gtk_signal_new ("select_child",
                    GTK_RUN_FIRST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkTreeClass, select_child),
-                   gtk_marshal_VOID__OBJECT,
+                   _gtk_marshal_VOID__OBJECT,
                    GTK_TYPE_NONE, 1,
                    GTK_TYPE_WIDGET);
   tree_signals[UNSELECT_CHILD] =
@@ -155,7 +156,7 @@ gtk_tree_class_init (GtkTreeClass *class)
                    GTK_RUN_FIRST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkTreeClass, unselect_child),
-                   gtk_marshal_VOID__OBJECT,
+                   _gtk_marshal_VOID__OBJECT,
                    GTK_TYPE_NONE, 1,
                    GTK_TYPE_WIDGET);
 }
index 20c13f6ebde0ee565c678a24cc00ac56cc6dd626..a6ca337e49d2b8dd4adf52bca991168050d31847 100644 (file)
@@ -28,6 +28,7 @@
 #include "gtkeventbox.h"
 #include "gtkpixmap.h"
 #include "gtkmain.h"
+#include "gtkmarshalers.h"
 #include "gtksignal.h"
 #define GTK_ENABLE_BROKEN
 #include "gtktree.h"
@@ -160,14 +161,14 @@ gtk_tree_item_class_init (GtkTreeItemClass *class)
                    GTK_RUN_FIRST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkTreeItemClass, expand),
-                   gtk_marshal_VOID__VOID,
+                   _gtk_marshal_VOID__VOID,
                    GTK_TYPE_NONE, 0);
   tree_item_signals[COLLAPSE_TREE] =
     gtk_signal_new ("collapse",
                    GTK_RUN_FIRST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkTreeItemClass, collapse),
-                   gtk_marshal_VOID__VOID,
+                   _gtk_marshal_VOID__VOID,
                    GTK_TYPE_NONE, 0);
 }
 
index 4e0e38bcf5e3e20803118128640f6c04f832a282..6800aa19931cfae1cb1cc3030b898cb586bc5696 100644 (file)
@@ -25,6 +25,7 @@
 #include "gtktreemodel.h"
 #include "gtktreeview.h"
 #include "gtktreeprivate.h"
+#include "gtkmarshalers.h"
 #include "gtksignal.h"
 
 
@@ -76,7 +77,7 @@ gtk_tree_model_base_init (gpointer g_class)
                     G_SIGNAL_RUN_LAST,
                     G_STRUCT_OFFSET (GtkTreeModelIface, row_changed),
                     NULL, NULL,
-                    gtk_marshal_VOID__BOXED_BOXED,
+                    _gtk_marshal_VOID__BOXED_BOXED,
                     G_TYPE_NONE, 2,
                     GTK_TYPE_TREE_PATH,
                     GTK_TYPE_TREE_ITER);
@@ -85,7 +86,7 @@ gtk_tree_model_base_init (gpointer g_class)
                     G_SIGNAL_RUN_LAST,
                     G_STRUCT_OFFSET (GtkTreeModelIface, row_inserted),
                     NULL, NULL,
-                    gtk_marshal_VOID__BOXED_BOXED,
+                    _gtk_marshal_VOID__BOXED_BOXED,
                     G_TYPE_NONE, 2,
                     GTK_TYPE_TREE_PATH,
                     GTK_TYPE_TREE_ITER);
@@ -94,7 +95,7 @@ gtk_tree_model_base_init (gpointer g_class)
                     G_SIGNAL_RUN_LAST,
                     G_STRUCT_OFFSET (GtkTreeModelIface, row_has_child_toggled),
                     NULL, NULL,
-                    gtk_marshal_VOID__BOXED_BOXED,
+                    _gtk_marshal_VOID__BOXED_BOXED,
                     G_TYPE_NONE, 2,
                     GTK_TYPE_TREE_PATH,
                     GTK_TYPE_TREE_ITER);
@@ -103,7 +104,7 @@ gtk_tree_model_base_init (gpointer g_class)
                     G_SIGNAL_RUN_LAST,
                     G_STRUCT_OFFSET (GtkTreeModelIface, row_deleted),
                     NULL, NULL,
-                    gtk_marshal_VOID__BOXED,
+                    _gtk_marshal_VOID__BOXED,
                     G_TYPE_NONE, 1,
                     GTK_TYPE_TREE_PATH);
       g_signal_new ("rows_reordered",
@@ -111,7 +112,7 @@ gtk_tree_model_base_init (gpointer g_class)
                     G_SIGNAL_RUN_LAST,
                     G_STRUCT_OFFSET (GtkTreeModelIface, rows_reordered),
                     NULL, NULL,
-                    gtk_marshal_VOID__BOXED_BOXED_POINTER,
+                    _gtk_marshal_VOID__BOXED_BOXED_POINTER,
                     G_TYPE_NONE, 3,
                     GTK_TYPE_TREE_PATH,
                     GTK_TYPE_TREE_ITER,
index a1f0b2be4d576befc8cb78b58501c2f683a58dcf..6174fc4789134daf95a4933e8ec886ed3aa9794d 100644 (file)
@@ -20,6 +20,7 @@
 #include "gtktreeselection.h"
 #include "gtktreeprivate.h"
 #include "gtkrbtree.h"
+#include "gtkmarshalers.h"
 #include "gtksignal.h"
 
 static void gtk_tree_selection_init              (GtkTreeSelection      *selection);
@@ -84,7 +85,7 @@ gtk_tree_selection_class_init (GtkTreeSelectionClass *class)
                    GTK_RUN_FIRST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkTreeSelectionClass, changed),
-                   gtk_marshal_VOID__VOID,
+                   _gtk_marshal_VOID__VOID,
                    GTK_TYPE_NONE, 0);
 }
 
index 1bf89a95a1972b664dc138207b5d72e9d84695ff..fe965ad9db1c4786254fd0a0afbe92856814e0a8 100644 (file)
@@ -19,6 +19,7 @@
 
 
 #include "gtktreesortable.h"
+#include "gtkmarshalers.h"
 #include "gtksignal.h"
 
 static void gtk_tree_sortable_base_init (gpointer g_class);
@@ -61,7 +62,7 @@ gtk_tree_sortable_base_init (gpointer g_class)
                     G_SIGNAL_RUN_LAST,
                     G_STRUCT_OFFSET (GtkTreeSortableIface, sort_column_changed),
                     NULL, NULL,
-                    gtk_marshal_VOID__VOID,
+                    _gtk_marshal_VOID__VOID,
                     G_TYPE_NONE, 0);
       initialized = TRUE;
     }
index eb5690015904fd645b4893973b2da2a467d3b34b..159e0b2b316da0c0cb24df701ab4054ff87470fb 100644 (file)
@@ -25,6 +25,7 @@
 #include "gtkcellrenderer.h"
 #include "gtksignal.h"
 #include "gtkmain.h"
+#include "gtkmarshalers.h"
 #include "gtkbutton.h"
 #include "gtkalignment.h"
 #include "gtklabel.h"
@@ -623,7 +624,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkTreeViewClass, set_scroll_adjustments),
-                   gtk_marshal_VOID__OBJECT_OBJECT,
+                   _gtk_marshal_VOID__OBJECT_OBJECT,
                    GTK_TYPE_NONE, 2,
                    GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT);
 
@@ -632,7 +633,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
                    GTK_RUN_LAST | GTK_RUN_ACTION,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkTreeViewClass, row_activated),
-                   gtk_marshal_VOID__BOXED_OBJECT,
+                   _gtk_marshal_VOID__BOXED_OBJECT,
                    GTK_TYPE_NONE, 2,
                    GTK_TYPE_TREE_PATH,
                    GTK_TYPE_TREE_VIEW_COLUMN);
@@ -643,7 +644,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GtkTreeViewClass, test_expand_row),
                   _gtk_boolean_handled_accumulator, NULL,
-                  gtk_marshal_BOOLEAN__BOXED_BOXED,
+                  _gtk_marshal_BOOLEAN__BOXED_BOXED,
                   G_TYPE_BOOLEAN, 2,
                   GTK_TYPE_TREE_ITER,
                   GTK_TYPE_TREE_PATH);
@@ -654,7 +655,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GtkTreeViewClass, test_collapse_row),
                   _gtk_boolean_handled_accumulator, NULL,
-                  gtk_marshal_BOOLEAN__BOXED_BOXED,
+                  _gtk_marshal_BOOLEAN__BOXED_BOXED,
                   G_TYPE_BOOLEAN, 2,
                   GTK_TYPE_TREE_ITER,
                   GTK_TYPE_TREE_PATH);
@@ -665,7 +666,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GtkTreeViewClass, row_expanded),
                   NULL, NULL,
-                  gtk_marshal_VOID__BOXED_BOXED,
+                  _gtk_marshal_VOID__BOXED_BOXED,
                   GTK_TYPE_NONE, 2,
                   GTK_TYPE_TREE_ITER,
                   GTK_TYPE_TREE_PATH);
@@ -676,7 +677,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GtkTreeViewClass, row_collapsed),
                   NULL, NULL,
-                  gtk_marshal_VOID__BOXED_BOXED,
+                  _gtk_marshal_VOID__BOXED_BOXED,
                   GTK_TYPE_NONE, 2,
                   GTK_TYPE_TREE_ITER,
                   GTK_TYPE_TREE_PATH);
@@ -687,7 +688,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GtkTreeViewClass, columns_changed),
                   NULL, NULL,
-                  gtk_marshal_NONE__NONE,
+                  _gtk_marshal_NONE__NONE,
                   G_TYPE_NONE, 0);
 
   tree_view_signals[CURSOR_CHANGED] =
@@ -696,7 +697,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GtkTreeViewClass, cursor_changed),
                   NULL, NULL,
-                  gtk_marshal_NONE__NONE,
+                  _gtk_marshal_NONE__NONE,
                   G_TYPE_NONE, 0);
 
   tree_view_signals[MOVE_CURSOR] =
@@ -705,7 +706,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
                   G_SIGNAL_RUN_LAST | GTK_RUN_ACTION,
                   G_STRUCT_OFFSET (GtkTreeViewClass, move_cursor),
                   NULL, NULL,
-                  gtk_marshal_VOID__ENUM_INT,
+                  _gtk_marshal_VOID__ENUM_INT,
                   GTK_TYPE_NONE, 2, GTK_TYPE_MOVEMENT_STEP, GTK_TYPE_INT);
 
   tree_view_signals[SELECT_ALL] =
@@ -714,7 +715,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
                   G_SIGNAL_RUN_LAST | GTK_RUN_ACTION,
                   G_STRUCT_OFFSET (GtkTreeViewClass, select_all),
                   NULL, NULL,
-                  gtk_marshal_NONE__NONE,
+                  _gtk_marshal_NONE__NONE,
                   GTK_TYPE_NONE, 0);
 
   tree_view_signals[SELECT_CURSOR_ROW] =
@@ -723,7 +724,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
                   G_SIGNAL_RUN_LAST | GTK_RUN_ACTION,
                   G_STRUCT_OFFSET (GtkTreeViewClass, select_cursor_row),
                   NULL, NULL,
-                  gtk_marshal_VOID__BOOLEAN,
+                  _gtk_marshal_VOID__BOOLEAN,
                   GTK_TYPE_NONE, 1,
                  G_TYPE_BOOLEAN);
 
@@ -733,7 +734,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
                   G_SIGNAL_RUN_LAST | GTK_RUN_ACTION,
                   G_STRUCT_OFFSET (GtkTreeViewClass, toggle_cursor_row),
                   NULL, NULL,
-                  gtk_marshal_NONE__NONE,
+                  _gtk_marshal_NONE__NONE,
                   GTK_TYPE_NONE, 0);
 
   tree_view_signals[EXPAND_COLLAPSE_CURSOR_ROW] =
@@ -742,7 +743,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
                   G_SIGNAL_RUN_LAST | GTK_RUN_ACTION,
                   G_STRUCT_OFFSET (GtkTreeViewClass, expand_collapse_cursor_row),
                   NULL, NULL,
-                  gtk_marshal_VOID__BOOLEAN_BOOLEAN_BOOLEAN,
+                  _gtk_marshal_VOID__BOOLEAN_BOOLEAN_BOOLEAN,
                   GTK_TYPE_NONE, 3, GTK_TYPE_BOOL, GTK_TYPE_BOOL, GTK_TYPE_BOOL);
 
   tree_view_signals[SELECT_CURSOR_PARENT] =
@@ -751,7 +752,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
                   G_SIGNAL_RUN_LAST | GTK_RUN_ACTION,
                   G_STRUCT_OFFSET (GtkTreeViewClass, select_cursor_parent),
                   NULL, NULL,
-                  gtk_marshal_NONE__NONE,
+                  _gtk_marshal_NONE__NONE,
                   GTK_TYPE_NONE, 0);
 
   tree_view_signals[START_INTERACTIVE_SEARCH] =
@@ -760,7 +761,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
                   G_SIGNAL_RUN_LAST | GTK_RUN_ACTION,
                   G_STRUCT_OFFSET (GtkTreeViewClass, start_interactive_search),
                   NULL, NULL,
-                  gtk_marshal_NONE__NONE,
+                  _gtk_marshal_NONE__NONE,
                   GTK_TYPE_NONE, 0);
 
   /* Key bindings */
index b3051f2aaec0725541eb7108f7c1dee3012ef219..a497abd3c8bb48a0242c497e5d92cc8ec19d44ed 100644 (file)
@@ -25,6 +25,7 @@
 #include "gtkalignment.h"
 #include "gtklabel.h"
 #include "gtkhbox.h"
+#include "gtkmarshalers.h"
 #include "gtkarrow.h"
 #include "gtkintl.h"
 #include <string.h>
@@ -162,7 +163,7 @@ gtk_tree_view_column_class_init (GtkTreeViewColumnClass *class)
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GtkTreeViewColumnClass, clicked),
                   NULL, NULL,
-                  gtk_marshal_VOID__VOID,
+                  _gtk_marshal_VOID__VOID,
                   GTK_TYPE_NONE, 0);
 
   g_object_class_install_property (object_class,
index 4ab5c7afb153b0d822eb57a3cf469044bdc1add8..1190ad43b8056f8ea8b3cfbc13162137e6821141 100644 (file)
@@ -27,6 +27,7 @@
 #include "gtksignal.h"
 #include "gtkviewport.h"
 #include "gtkintl.h"
+#include "gtkmarshalers.h"
 
 enum {
   PROP_0,
@@ -155,7 +156,7 @@ gtk_viewport_class_init (GtkViewportClass *class)
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkViewportClass, set_scroll_adjustments),
-                   gtk_marshal_VOID__OBJECT_OBJECT,
+                   _gtk_marshal_VOID__OBJECT_OBJECT,
                    GTK_TYPE_NONE, 2, GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT);
 }
 
index 0e1cada2911216d1d918eef4a7027b7a345a13f1..b65e0d68fe65c7903364270305314e2fd5f6284f 100644 (file)
@@ -32,6 +32,7 @@
 #include "gtkiconfactory.h"
 #include "gtkintl.h"
 #include "gtkmain.h"
+#include "gtkmarshalers.h"
 #include "gtkrc.h"
 #include "gtkselection.h"
 #include "gtksettings.h"
@@ -511,42 +512,42 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_FIRST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, show),
-                   gtk_marshal_VOID__VOID,
+                   _gtk_marshal_VOID__VOID,
                    GTK_TYPE_NONE, 0);
   widget_signals[HIDE] =
     gtk_signal_new ("hide",
                    GTK_RUN_FIRST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, hide),
-                   gtk_marshal_VOID__VOID,
+                   _gtk_marshal_VOID__VOID,
                    GTK_TYPE_NONE, 0);
   widget_signals[MAP] =
     gtk_signal_new ("map",
                    GTK_RUN_FIRST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, map),
-                   gtk_marshal_VOID__VOID,
+                   _gtk_marshal_VOID__VOID,
                    GTK_TYPE_NONE, 0);
   widget_signals[UNMAP] =
     gtk_signal_new ("unmap",
                    GTK_RUN_FIRST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, unmap),
-                   gtk_marshal_VOID__VOID,
+                   _gtk_marshal_VOID__VOID,
                    GTK_TYPE_NONE, 0);
   widget_signals[REALIZE] =
     gtk_signal_new ("realize",
                    GTK_RUN_FIRST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, realize),
-                   gtk_marshal_VOID__VOID,
+                   _gtk_marshal_VOID__VOID,
                    GTK_TYPE_NONE, 0);
   widget_signals[UNREALIZE] =
     gtk_signal_new ("unrealize",
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, unrealize),
-                   gtk_marshal_VOID__VOID,
+                   _gtk_marshal_VOID__VOID,
                    GTK_TYPE_NONE, 0);
   widget_signals[SIZE_REQUEST] =
     g_signal_new ("size_request",
@@ -554,7 +555,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                   G_SIGNAL_RUN_FIRST,
                   G_STRUCT_OFFSET (GtkWidgetClass, size_request),
                   NULL, NULL,
-                  gtk_marshal_VOID__BOXED,
+                  _gtk_marshal_VOID__BOXED,
                   GTK_TYPE_NONE, 1,
                   GTK_TYPE_REQUISITION | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[SIZE_ALLOCATE] = 
@@ -562,7 +563,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_FIRST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, size_allocate),
-                   gtk_marshal_VOID__BOXED,
+                   _gtk_marshal_VOID__BOXED,
                    GTK_TYPE_NONE, 1,
                    GDK_TYPE_RECTANGLE | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[STATE_CHANGED] =
@@ -570,7 +571,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_FIRST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, state_changed),
-                   gtk_marshal_VOID__ENUM,
+                   _gtk_marshal_VOID__ENUM,
                    GTK_TYPE_NONE, 1,
                    GTK_TYPE_STATE_TYPE);
   widget_signals[PARENT_SET] =
@@ -578,7 +579,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_FIRST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, parent_set),
-                   gtk_marshal_VOID__OBJECT,
+                   _gtk_marshal_VOID__OBJECT,
                    GTK_TYPE_NONE, 1,
                    GTK_TYPE_WIDGET);
   widget_signals[HIERARCHY_CHANGED] =
@@ -586,7 +587,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, hierarchy_changed),
-                   gtk_marshal_VOID__OBJECT,
+                   _gtk_marshal_VOID__OBJECT,
                    GTK_TYPE_NONE, 1,
                    GTK_TYPE_WIDGET);
   widget_signals[STYLE_SET] =
@@ -594,7 +595,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_FIRST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, style_set),
-                   gtk_marshal_VOID__OBJECT,
+                   _gtk_marshal_VOID__OBJECT,
                    GTK_TYPE_NONE, 1,
                    GTK_TYPE_STYLE);
   widget_signals[DIRECTION_CHANGED] =
@@ -602,7 +603,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_FIRST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, direction_changed),
-                   gtk_marshal_VOID__ENUM,
+                   _gtk_marshal_VOID__ENUM,
                    GTK_TYPE_NONE, 1,
                    GTK_TYPE_TEXT_DIRECTION);
   widget_signals[GRAB_NOTIFY] =
@@ -610,7 +611,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_FIRST,
                    GTK_CLASS_TYPE (object_class),
                     GTK_SIGNAL_OFFSET (GtkWidgetClass, grab_notify),
-                   gtk_marshal_VOID__BOOLEAN,
+                   _gtk_marshal_VOID__BOOLEAN,
                    GTK_TYPE_NONE, 1,
                    GTK_TYPE_BOOL);
   widget_signals[CHILD_NOTIFY] =
@@ -628,7 +629,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                   GTK_RUN_LAST,
                   GTK_SIGNAL_OFFSET (GtkWidgetClass, mnemonic_activate),
                   _gtk_boolean_handled_accumulator, NULL,
-                  gtk_marshal_BOOLEAN__BOOLEAN,
+                  _gtk_marshal_BOOLEAN__BOOLEAN,
                   GTK_TYPE_BOOL, 1,
                   GTK_TYPE_BOOL);
   widget_signals[GRAB_FOCUS] =
@@ -636,7 +637,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_LAST | GTK_RUN_ACTION,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, grab_focus),
-                   gtk_marshal_VOID__VOID,
+                   _gtk_marshal_VOID__VOID,
                    GTK_TYPE_NONE, 0);
   widget_signals[FOCUS] =
     g_signal_new ("focus",
@@ -644,7 +645,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GtkWidgetClass, focus),
                   _gtk_boolean_handled_accumulator, NULL,
-                  gtk_marshal_BOOLEAN__ENUM,
+                  _gtk_marshal_BOOLEAN__ENUM,
                   G_TYPE_BOOLEAN, 1,
                   GTK_TYPE_DIRECTION_TYPE);
   widget_signals[EVENT] =
@@ -653,7 +654,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET(GtkWidgetClass, event),
                   _gtk_boolean_handled_accumulator, NULL,
-                  gtk_marshal_BOOLEAN__BOXED,
+                  _gtk_marshal_BOOLEAN__BOXED,
                   G_TYPE_BOOLEAN, 1,
                   GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[EVENT_AFTER] =
@@ -662,7 +663,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                   0,
                   0,
                   NULL, NULL,
-                  gtk_marshal_VOID__BOXED,
+                  _gtk_marshal_VOID__BOXED,
                   G_TYPE_NONE, 1, GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[BUTTON_PRESS_EVENT] =
     g_signal_new ("button_press_event",
@@ -670,7 +671,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET(GtkWidgetClass, button_press_event),
                   _gtk_boolean_handled_accumulator, NULL,
-                  gtk_marshal_BOOLEAN__BOXED,
+                  _gtk_marshal_BOOLEAN__BOXED,
                   G_TYPE_BOOLEAN, 1,
                   GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[BUTTON_RELEASE_EVENT] =
@@ -679,7 +680,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET(GtkWidgetClass, button_release_event),
                   _gtk_boolean_handled_accumulator, NULL,
-                  gtk_marshal_BOOLEAN__BOXED,
+                  _gtk_marshal_BOOLEAN__BOXED,
                   G_TYPE_BOOLEAN, 1,
                   GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[SCROLL_EVENT] =
@@ -688,7 +689,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET(GtkWidgetClass, scroll_event),
                   _gtk_boolean_handled_accumulator, NULL,
-                  gtk_marshal_BOOLEAN__BOXED,
+                  _gtk_marshal_BOOLEAN__BOXED,
                   G_TYPE_BOOLEAN, 1,
                   GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[MOTION_NOTIFY_EVENT] =
@@ -697,7 +698,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET(GtkWidgetClass, motion_notify_event),
                   _gtk_boolean_handled_accumulator, NULL,
-                  gtk_marshal_BOOLEAN__BOXED,
+                  _gtk_marshal_BOOLEAN__BOXED,
                   G_TYPE_BOOLEAN, 1,
                   GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[DELETE_EVENT] =
@@ -706,7 +707,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET(GtkWidgetClass, delete_event),
                   _gtk_boolean_handled_accumulator, NULL,
-                  gtk_marshal_BOOLEAN__BOXED,
+                  _gtk_marshal_BOOLEAN__BOXED,
                   G_TYPE_BOOLEAN, 1,
                   GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[DESTROY_EVENT] =
@@ -715,7 +716,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET(GtkWidgetClass, destroy_event),
                   _gtk_boolean_handled_accumulator, NULL,
-                  gtk_marshal_BOOLEAN__BOXED,
+                  _gtk_marshal_BOOLEAN__BOXED,
                   G_TYPE_BOOLEAN, 1,
                   GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[EXPOSE_EVENT] =
@@ -724,7 +725,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET(GtkWidgetClass, expose_event),
                   _gtk_boolean_handled_accumulator, NULL,
-                  gtk_marshal_BOOLEAN__BOXED,
+                  _gtk_marshal_BOOLEAN__BOXED,
                   G_TYPE_BOOLEAN, 1,
                   GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[KEY_PRESS_EVENT] =
@@ -733,7 +734,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET(GtkWidgetClass, key_press_event),
                   _gtk_boolean_handled_accumulator, NULL,
-                  gtk_marshal_BOOLEAN__BOXED,
+                  _gtk_marshal_BOOLEAN__BOXED,
                   G_TYPE_BOOLEAN, 1,
                   GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[KEY_RELEASE_EVENT] =
@@ -742,7 +743,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET(GtkWidgetClass, key_release_event),
                   _gtk_boolean_handled_accumulator, NULL,
-                  gtk_marshal_BOOLEAN__BOXED,
+                  _gtk_marshal_BOOLEAN__BOXED,
                   G_TYPE_BOOLEAN, 1,
                   GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[ENTER_NOTIFY_EVENT] =
@@ -751,7 +752,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET(GtkWidgetClass, enter_notify_event),
                   _gtk_boolean_handled_accumulator, NULL,
-                  gtk_marshal_BOOLEAN__BOXED,
+                  _gtk_marshal_BOOLEAN__BOXED,
                   G_TYPE_BOOLEAN, 1,
                   GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[LEAVE_NOTIFY_EVENT] =
@@ -760,7 +761,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET(GtkWidgetClass, leave_notify_event),
                   _gtk_boolean_handled_accumulator, NULL,
-                  gtk_marshal_BOOLEAN__BOXED,
+                  _gtk_marshal_BOOLEAN__BOXED,
                   G_TYPE_BOOLEAN, 1,
                   GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[CONFIGURE_EVENT] =
@@ -769,7 +770,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET(GtkWidgetClass, configure_event),
                   _gtk_boolean_handled_accumulator, NULL,
-                  gtk_marshal_BOOLEAN__BOXED,
+                  _gtk_marshal_BOOLEAN__BOXED,
                   G_TYPE_BOOLEAN, 1,
                   GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[FOCUS_IN_EVENT] =
@@ -778,7 +779,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET(GtkWidgetClass, focus_in_event),
                   _gtk_boolean_handled_accumulator, NULL,
-                  gtk_marshal_BOOLEAN__BOXED,
+                  _gtk_marshal_BOOLEAN__BOXED,
                   G_TYPE_BOOLEAN, 1,
                   GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[FOCUS_OUT_EVENT] =
@@ -787,7 +788,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET(GtkWidgetClass, focus_out_event),
                   _gtk_boolean_handled_accumulator, NULL,
-                  gtk_marshal_BOOLEAN__BOXED,
+                  _gtk_marshal_BOOLEAN__BOXED,
                   G_TYPE_BOOLEAN, 1,
                   GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[MAP_EVENT] =
@@ -796,7 +797,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET(GtkWidgetClass, map_event),
                   _gtk_boolean_handled_accumulator, NULL,
-                  gtk_marshal_BOOLEAN__BOXED,
+                  _gtk_marshal_BOOLEAN__BOXED,
                   G_TYPE_BOOLEAN, 1,
                   GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[UNMAP_EVENT] =
@@ -805,7 +806,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET(GtkWidgetClass, unmap_event),
                   _gtk_boolean_handled_accumulator, NULL,
-                  gtk_marshal_BOOLEAN__BOXED,
+                  _gtk_marshal_BOOLEAN__BOXED,
                   G_TYPE_BOOLEAN, 1,
                   GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[PROPERTY_NOTIFY_EVENT] =
@@ -814,7 +815,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET(GtkWidgetClass, property_notify_event),
                   _gtk_boolean_handled_accumulator, NULL,
-                  gtk_marshal_BOOLEAN__BOXED,
+                  _gtk_marshal_BOOLEAN__BOXED,
                   G_TYPE_BOOLEAN, 1,
                   GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[SELECTION_CLEAR_EVENT] =
@@ -823,7 +824,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET(GtkWidgetClass, selection_clear_event),
                   _gtk_boolean_handled_accumulator, NULL,
-                  gtk_marshal_BOOLEAN__BOXED,
+                  _gtk_marshal_BOOLEAN__BOXED,
                   G_TYPE_BOOLEAN, 1,
                   GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[SELECTION_REQUEST_EVENT] =
@@ -832,7 +833,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET(GtkWidgetClass, selection_request_event),
                   _gtk_boolean_handled_accumulator, NULL,
-                  gtk_marshal_BOOLEAN__BOXED,
+                  _gtk_marshal_BOOLEAN__BOXED,
                   G_TYPE_BOOLEAN, 1,
                   GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[SELECTION_NOTIFY_EVENT] =
@@ -841,7 +842,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET(GtkWidgetClass, selection_notify_event),
                   _gtk_boolean_handled_accumulator, NULL,
-                  gtk_marshal_BOOLEAN__BOXED,
+                  _gtk_marshal_BOOLEAN__BOXED,
                   G_TYPE_BOOLEAN, 1,
                   GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[SELECTION_RECEIVED] =
@@ -850,7 +851,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkWidgetClass, selection_received),
                  NULL, NULL,
-                 gtk_marshal_VOID__BOXED_UINT,
+                 _gtk_marshal_VOID__BOXED_UINT,
                  G_TYPE_NONE, 2,
                  GTK_TYPE_SELECTION_DATA | G_SIGNAL_TYPE_STATIC_SCOPE,
                  G_TYPE_UINT);
@@ -860,7 +861,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkWidgetClass, selection_get),
                  NULL, NULL,
-                 gtk_marshal_VOID__BOXED_UINT_UINT,
+                 _gtk_marshal_VOID__BOXED_UINT_UINT,
                  G_TYPE_NONE, 3,
                  GTK_TYPE_SELECTION_DATA | G_SIGNAL_TYPE_STATIC_SCOPE,
                  G_TYPE_UINT,
@@ -871,7 +872,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET(GtkWidgetClass, proximity_in_event),
                   _gtk_boolean_handled_accumulator, NULL,
-                  gtk_marshal_BOOLEAN__BOXED,
+                  _gtk_marshal_BOOLEAN__BOXED,
                   G_TYPE_BOOLEAN, 1,
                   GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[PROXIMITY_OUT_EVENT] =
@@ -880,7 +881,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET(GtkWidgetClass, proximity_out_event),
                   _gtk_boolean_handled_accumulator, NULL,
-                  gtk_marshal_BOOLEAN__BOXED,
+                  _gtk_marshal_BOOLEAN__BOXED,
                   G_TYPE_BOOLEAN, 1,
                   GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[DRAG_LEAVE] =
@@ -888,7 +889,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, drag_leave),
-                   gtk_marshal_VOID__OBJECT_UINT,
+                   _gtk_marshal_VOID__OBJECT_UINT,
                    GTK_TYPE_NONE, 2,
                    GDK_TYPE_DRAG_CONTEXT,
                    GTK_TYPE_UINT);
@@ -897,7 +898,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, drag_begin),
-                   gtk_marshal_VOID__OBJECT,
+                   _gtk_marshal_VOID__OBJECT,
                    GTK_TYPE_NONE, 1,
                    GDK_TYPE_DRAG_CONTEXT);
   widget_signals[DRAG_END] =
@@ -905,7 +906,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, drag_end),
-                   gtk_marshal_VOID__OBJECT,
+                   _gtk_marshal_VOID__OBJECT,
                    GTK_TYPE_NONE, 1,
                    GDK_TYPE_DRAG_CONTEXT);
   widget_signals[DRAG_DATA_DELETE] =
@@ -913,7 +914,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, drag_data_delete),
-                   gtk_marshal_VOID__OBJECT,
+                   _gtk_marshal_VOID__OBJECT,
                    GTK_TYPE_NONE, 1,
                    GDK_TYPE_DRAG_CONTEXT);
   widget_signals[DRAG_MOTION] =
@@ -922,7 +923,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET(GtkWidgetClass, drag_motion),
                   _gtk_boolean_handled_accumulator, NULL,
-                 gtk_marshal_BOOLEAN__OBJECT_INT_INT_UINT,
+                 _gtk_marshal_BOOLEAN__OBJECT_INT_INT_UINT,
                  G_TYPE_BOOLEAN, 4,
                  GDK_TYPE_DRAG_CONTEXT,
                  G_TYPE_INT,
@@ -934,7 +935,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET(GtkWidgetClass, drag_drop),
                   _gtk_boolean_handled_accumulator, NULL,
-                 gtk_marshal_BOOLEAN__OBJECT_INT_INT_UINT,
+                 _gtk_marshal_BOOLEAN__OBJECT_INT_INT_UINT,
                  G_TYPE_BOOLEAN, 4,
                  GDK_TYPE_DRAG_CONTEXT,
                  G_TYPE_INT,
@@ -946,7 +947,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkWidgetClass, drag_data_get),
                  NULL, NULL,
-                 gtk_marshal_VOID__OBJECT_BOXED_UINT_UINT,
+                 _gtk_marshal_VOID__OBJECT_BOXED_UINT_UINT,
                  G_TYPE_NONE, 4,
                  GDK_TYPE_DRAG_CONTEXT,
                  GTK_TYPE_SELECTION_DATA | G_SIGNAL_TYPE_STATIC_SCOPE,
@@ -958,7 +959,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                  G_SIGNAL_RUN_LAST,
                  GTK_SIGNAL_OFFSET (GtkWidgetClass, drag_data_received),
                  NULL, NULL,
-                 gtk_marshal_VOID__OBJECT_INT_INT_BOXED_UINT_UINT,
+                 _gtk_marshal_VOID__OBJECT_INT_INT_BOXED_UINT_UINT,
                  G_TYPE_NONE, 6,
                  GDK_TYPE_DRAG_CONTEXT,
                  G_TYPE_INT,
@@ -972,7 +973,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET(GtkWidgetClass, visibility_notify_event),
                   _gtk_boolean_handled_accumulator, NULL,
-                 gtk_marshal_BOOLEAN__BOXED,
+                 _gtk_marshal_BOOLEAN__BOXED,
                  G_TYPE_BOOLEAN, 1,
                   GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[CLIENT_EVENT] =
@@ -981,7 +982,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET(GtkWidgetClass, client_event),
                  _gtk_boolean_handled_accumulator, NULL,
-                 gtk_marshal_BOOLEAN__BOXED,
+                 _gtk_marshal_BOOLEAN__BOXED,
                  G_TYPE_BOOLEAN, 1,
                  GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[NO_EXPOSE_EVENT] =
@@ -990,7 +991,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET(GtkWidgetClass, no_expose_event),
                  _gtk_boolean_handled_accumulator, NULL,
-                 gtk_marshal_BOOLEAN__BOXED,
+                 _gtk_marshal_BOOLEAN__BOXED,
                  G_TYPE_BOOLEAN, 1,
                  GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[WINDOW_STATE_EVENT] =
@@ -999,7 +1000,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET(GtkWidgetClass, window_state_event),
                  _gtk_boolean_handled_accumulator, NULL,
-                 gtk_marshal_BOOLEAN__BOXED,
+                 _gtk_marshal_BOOLEAN__BOXED,
                  G_TYPE_BOOLEAN, 1,
                  GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[POPUP_MENU] =
@@ -1007,14 +1008,14 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_LAST | GTK_RUN_ACTION,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, popup_menu),
-                    gtk_marshal_NONE__NONE,
+                    _gtk_marshal_NONE__NONE,
                    GTK_TYPE_NONE, 0);
   widget_signals[SHOW_HELP] =
     gtk_signal_new ("show_help",
                    GTK_RUN_LAST | GTK_RUN_ACTION,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, show_help),
-                    gtk_marshal_NONE__ENUM,
+                    _gtk_marshal_NONE__ENUM,
                    GTK_TYPE_NONE, 1, GTK_TYPE_WIDGET_HELP_TYPE);
   widget_signals[ACCEL_CLOSURES_CHANGED] =
     gtk_signal_new ("accel_closures_changed",
index a6153685c4df1db67e0b2c3cc504043faee3d0f2..de3e356ed13b2d09d549691213765cf1f7d7c097 100644 (file)
@@ -38,6 +38,7 @@
 #include "gtkmain.h"
 #include "gtkiconfactory.h"
 #include "gtkintl.h"
+#include "gtkmarshalers.h"
 
 enum {
   SET_FOCUS,
@@ -454,7 +455,7 @@ gtk_window_class_init (GtkWindowClass *klass)
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GtkWindowClass, set_focus),
                   NULL, NULL,
-                  gtk_marshal_VOID__OBJECT,
+                  _gtk_marshal_VOID__OBJECT,
                   G_TYPE_NONE, 1,
                   GTK_TYPE_WIDGET);
   
@@ -464,7 +465,7 @@ gtk_window_class_init (GtkWindowClass *klass)
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET(GtkWindowClass, frame_event),
                   _gtk_boolean_handled_accumulator, NULL,
-                  gtk_marshal_BOOLEAN__BOXED,
+                  _gtk_marshal_BOOLEAN__BOXED,
                   G_TYPE_BOOLEAN, 1,
                   GDK_TYPE_EVENT);
 
@@ -474,7 +475,7 @@ gtk_window_class_init (GtkWindowClass *klass)
                   G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
                   GTK_SIGNAL_OFFSET (GtkWindowClass, activate_focus),
                   NULL, NULL,
-                  gtk_marshal_VOID__VOID,
+                  _gtk_marshal_VOID__VOID,
                   G_TYPE_NONE,
                   0);
 
@@ -484,7 +485,7 @@ gtk_window_class_init (GtkWindowClass *klass)
                   G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
                   GTK_SIGNAL_OFFSET (GtkWindowClass, activate_default),
                   NULL, NULL,
-                  gtk_marshal_VOID__VOID,
+                  _gtk_marshal_VOID__VOID,
                   G_TYPE_NONE,
                   0);
 
@@ -494,7 +495,7 @@ gtk_window_class_init (GtkWindowClass *klass)
                   G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
                   GTK_SIGNAL_OFFSET (GtkWindowClass, move_focus),
                   NULL, NULL,
-                  gtk_marshal_VOID__ENUM,
+                  _gtk_marshal_VOID__ENUM,
                   G_TYPE_NONE,
                   1,
                   GTK_TYPE_DIRECTION_TYPE);